# | Line 54 | Line 54 | |
---|---|---|
54 | #include <list> | |
55 | #include <string> | |
56 | #include <vector> | |
57 | + | #include "config.h" |
58 | namespace oopse{ | |
59 | ||
60 | /** | |
# | Line 148 | Line 149 | namespace oopse{ | |
149 | /** FloatGenericData is a generic data type contains a float variable */ | |
150 | typedef SimpleTypeData<float> FloatGenericData; | |
151 | ||
152 | < | /** DoubleGenericData is a generic data type contains a double variable */ |
153 | < | typedef SimpleTypeData<double> DoubleGenericData; |
152 | > | /** DoubleGenericData is a generic data type contains a RealType variable */ |
153 | > | typedef SimpleTypeData<RealType> DoubleGenericData; |
154 | ||
155 | /** | |
156 | * @typedef StringGenericData | |
# | Line 189 | Line 190 | namespace oopse{ | |
190 | VectorTypeData(const std::string& id) | |
191 | : GenericData(id){} | |
192 | ||
193 | < | VectorTypeData(const SelfType& s) : SelfType(s){} |
193 | > | VectorTypeData(const SelfType& s) : data_(s){} |
194 | ||
195 | SelfType& operator =(const SelfType& s){ | |
196 | if (this == &s) | |
# | Line 217 | Line 218 | namespace oopse{ | |
218 | ||
219 | /** | |
220 | * @typedef IntVectorGenericData | |
221 | < | * A generic data type contains a std::vector<double> variable. |
221 | > | * A generic data type contains a std::vector<RealType> variable. |
222 | */ | |
223 | < | typedef VectorTypeData<double> DoubleVectorGenericData; |
223 | > | typedef VectorTypeData<RealType> DoubleVectorGenericData; |
224 | ||
225 | /** | |
226 | * @typedef StringVectorGenericData |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |