TimeSeriesPlatformLibrary: Updated code and cmakelist to run on Linux.

J. Ritchie Carroll committed 7 years ago

Commit 59ea35e1 parent ebf0ccd10 files · +428 −41Browse files

Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Data (2 of 10 files). Show all

Unified · Split

2 files

Source/Libraries/TimeSeriesPlatformLibrary/Data/DataColumn.h +1 −1
Source/Libraries/TimeSeriesPlatformLibrary/Data/DataSet.h +1 −1

Source/Libraries/TimeSeriesPlatformLibrary/Data/DataColumn.h+1−1

@@ -48,7 +48,7 @@ namespace Data · 47 unmodified lines
48	UInt64	48	UInt64
49	};	49	};
50		50
51	const char* DataTypeAcronym[];	51	const extern char* DataTypeAcronym[];
52	const char* EnumName(DataType type);	52	const char* EnumName(DataType type);
53		53
54	class DataTable;	54	class DataTable;

Source/Libraries/TimeSeriesPlatformLibrary/Data/DataSet.h+1−1

@@ -52,7 +52,7 @@ namespace Data · 51 unmodified lines
52	class DataSet : public GSF::EnableSharedThisPtr<DataSet> // NOLINT	52	class DataSet : public GSF::EnableSharedThisPtr<DataSet> // NOLINT
53	{	53	{
54	private:	54	private:
55	GSF::StringMap<DataTablePtr> m_tables;	55	GSF::SortedStringMap<DataTablePtr> m_tables;
56		56
57	void ParseXml(const pugi::xml_document& document);	57	void ParseXml(const pugi::xml_document& document);
58	void GenerateXml(pugi::xml_document& document, const std::string& dataSetName) const;	58	void GenerateXml(pugi::xml_document& document, const std::string& dataSetName) const;