Skip to content

Commit 25fb13b

Browse files
author
Tristan Youngs
committed
Fix for de-template-serialisable rebase.
1 parent 8f22b22 commit 25fb13b

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/math/data3D.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class Histogram3D;
1212

1313
// One-Dimensional Data
14-
class Data3D : public Data3DBase, public Serialisable<>
14+
class Data3D : public Data3DBase, public Serialisable
1515
{
1616
public:
1717
Data3D();

src/math/histogram2D.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "templates/array2D.h"
99

1010
// Two-Dimensional Histogram
11-
class Histogram2D : public Serialisable<>
11+
class Histogram2D : public Serialisable
1212
{
1313
public:
1414
Histogram2D();
@@ -112,5 +112,5 @@ class Histogram2D : public Serialisable<>
112112
// Express as a serialisable value
113113
void serialise(std::string tag, SerialisedValue &target) const override;
114114
// Read values from a serialisable value
115-
void deserialise(const SerialisedValue &node);
115+
void deserialise(const SerialisedValue &node) override;
116116
};

src/math/histogram3D.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "math/sampledDouble.h"
88
#include "templates/array3D.h"
99

10-
class Histogram3D : public Serialisable<>
10+
class Histogram3D : public Serialisable
1111
{
1212
public:
1313
Histogram3D();
@@ -134,5 +134,5 @@ class Histogram3D : public Serialisable<>
134134
// Express as a serialisable value
135135
void serialise(std::string tag, SerialisedValue &target) const override;
136136
// Read values from a serialisable value
137-
void deserialise(const SerialisedValue &node);
137+
void deserialise(const SerialisedValue &node) override;
138138
};

src/math/integerHistogram1D.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "math/sampledDouble.h"
99
#include <map>
1010

11-
class IntegerHistogram1D : public Serialisable<>
11+
class IntegerHistogram1D : public Serialisable
1212
{
1313
public:
1414
IntegerHistogram1D();
@@ -76,5 +76,5 @@ class IntegerHistogram1D : public Serialisable<>
7676
// Express as a serialisable value
7777
void serialise(std::string tag, SerialisedValue &target) const override;
7878
// Read values from a serialisable value
79-
void deserialise(const SerialisedValue &node);
79+
void deserialise(const SerialisedValue &node) override;
8080
};

0 commit comments

Comments
 (0)