enum ostream and stdio name change (8bc9438e) · Commits · Tomáš Jakubec / GTMesh

src/GTMesh/Debug/ConsoleLogger.h

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@
	/**		/**
	* @brief The ConsoleLogger class		* @brief The ConsoleLogger class
	*/		*/
	template <VARIABLE_EXPORT_METHOD method = VARIABLE_EXPORT_METHOD::ostream>		template <VARIABLE_EXPORT_METHOD method = VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_OSTREAM>
	class ConsoleLogger {		class ConsoleLogger {

	public:		public:
	@@ -131,7 +131,7 @@ public:


	template <>		template <>
	class ConsoleLogger<VARIABLE_EXPORT_METHOD::stdio> {		class ConsoleLogger<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_STDIO> {

	public:		public:

	@@ -150,7 +150,7 @@ public:
	sourceFile,		sourceFile,
	line);		line);

	VariableExport<VARIABLE_EXPORT_METHOD::stdio>::exportVariable(message);		VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_STDIO>::exportVariable(message);

	printf(" <==\n");		printf(" <==\n");
	}		}
	@@ -186,7 +186,7 @@ public:
	line,		line,
	name);		name);

	VariableExport<VARIABLE_EXPORT_METHOD::stdio>::exportVariable(value);		VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_STDIO>::exportVariable(value);
	printf("\n");		printf("\n");
	}		}

	@@ -198,7 +198,7 @@ public:
	line,		line,
	name);		name);

	VariableExport<VARIABLE_EXPORT_METHOD::stdio>::exportVariable(value);		VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_STDIO>::exportVariable(value);
	printf("\n");		printf("\n");
	}		}

src/GTMesh/Debug/VariableExport.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -9,11 +9,11 @@


	enum VARIABLE_EXPORT_METHOD {		enum VARIABLE_EXPORT_METHOD {
	ostream,		VARIABLE_EXPORT_METHOD_OSTREAM,
	stdio		VARIABLE_EXPORT_METHOD_STDIO
	};		};

	template <VARIABLE_EXPORT_METHOD target = VARIABLE_EXPORT_METHOD::ostream>		template <VARIABLE_EXPORT_METHOD target = VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_OSTREAM>
	struct VariableExport {		struct VariableExport {


	@@ -194,7 +194,7 @@ struct VariableExport {


	template <>		template <>
	struct VariableExport<VARIABLE_EXPORT_METHOD::stdio> {		struct VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_STDIO> {


	static void exportVariable(...)		static void exportVariable(...)

src/UnitTests/Debug/VariableExportTest.cpp

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -17,19 +17,19 @@ TEST( VariableExportTest_Basic, basicTest )

	std::stringstream ss;		std::stringstream ss;

	VariableExport<VARIABLE_EXPORT_METHOD::ostream>::exportVariable(ss, r);		VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_OSTREAM>::exportVariable(ss, r);
	EXPECT_EQ(ss.str(),"42.15");		EXPECT_EQ(ss.str(),"42.15");
	ss.str("");		ss.str("");
	ss.clear();		ss.clear();
	VariableExport<VARIABLE_EXPORT_METHOD::ostream>::exportVariable(ss, i);		VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_OSTREAM>::exportVariable(ss, i);
	EXPECT_EQ(ss.str(),"15");		EXPECT_EQ(ss.str(),"15");
	ss.str("");		ss.str("");
	ss.clear();		ss.clear();
	VariableExport<VARIABLE_EXPORT_METHOD::ostream>::exportVariable(ss, c);		VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_OSTREAM>::exportVariable(ss, c);
	EXPECT_EQ(ss.str(),"\"*\"");		EXPECT_EQ(ss.str(),"\"*\"");
	ss.str("");		ss.str("");
	ss.clear();		ss.clear();
	VariableExport<VARIABLE_EXPORT_METHOD::ostream>::exportVariable(ss, b);		VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_OSTREAM>::exportVariable(ss, b);
	EXPECT_EQ(ss.str(),"false");		EXPECT_EQ(ss.str(),"false");
	ss.str("");		ss.str("");
	ss.clear();		ss.clear();
	@@ -50,15 +50,15 @@ TEST( VariableExportTest_Container, basicTest )

	std::stringstream ss;		std::stringstream ss;

	VariableExport<VARIABLE_EXPORT_METHOD::ostream>::exportVariable(ss, list);		VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_OSTREAM>::exportVariable(ss, list);
	EXPECT_EQ(ss.str(),"[ 1, 2, 3 ]");		EXPECT_EQ(ss.str(),"[ 1, 2, 3 ]");
	ss.str("");		ss.str("");
	ss.clear();		ss.clear();
	VariableExport<VARIABLE_EXPORT_METHOD::ostream>::exportVariable(ss, vec);		VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_OSTREAM>::exportVariable(ss, vec);
	EXPECT_EQ(ss.str(),"[ [ 1, 2, 3 ], [ 1, 2, 3 ], [ 1, 2, 3 ], [ 1, 2, 3 ], [ 1, 2, 3 ] ]");		EXPECT_EQ(ss.str(),"[ [ 1, 2, 3 ], [ 1, 2, 3 ], [ 1, 2, 3 ], [ 1, 2, 3 ], [ 1, 2, 3 ] ]");
	ss.str("");		ss.str("");
	ss.clear();		ss.clear();
	VariableExport<VARIABLE_EXPORT_METHOD::ostream>::exportVariable(ss, m);		VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_OSTREAM>::exportVariable(ss, m);
	EXPECT_EQ(ss.str(),R"([ { "druhy": 2}, { "prvni": 1}, { "treti": 3} ])");		EXPECT_EQ(ss.str(),R"([ { "druhy": 2}, { "prvni": 1}, { "treti": 3} ])");
	ss.str("");		ss.str("");
	ss.clear();		ss.clear();
	@@ -109,7 +109,7 @@ TEST( VariableExportTest_Traited, basicTest )

	std::stringstream ss;		std::stringstream ss;

	VariableExport<VARIABLE_EXPORT_METHOD::ostream>::exportVariable(ss, e);		VariableExport<VARIABLE_EXPORT_METHOD::VARIABLE_EXPORT_METHOD_OSTREAM>::exportVariable(ss, e);
	EXPECT_EQ(ss.str(),R"({ "attrInt" : 1, "attrDouble" : 42.15, "attrFloat" : 15.8, "attrLongDouble" : 1.58e+301, "attrChar" : "*", "attrULL" : 465135168421684684, "attrStr" : "Ahojky", "attrTempData" : { "density" : 42.15, "momentum" : [ 42.15, 84.3, 42.15 ] }, "attrVec" : [ "tohle", "je", "nejlepsi", "debugovaci", "system" ] })");		EXPECT_EQ(ss.str(),R"({ "attrInt" : 1, "attrDouble" : 42.15, "attrFloat" : 15.8, "attrLongDouble" : 1.58e+301, "attrChar" : "*", "attrULL" : 465135168421684684, "attrStr" : "Ahojky", "attrTempData" : { "density" : 42.15, "momentum" : [ 42.15, 84.3, 42.15 ] }, "attrVec" : [ "tohle", "je", "nejlepsi", "debugovaci", "system" ] })");
	ss.str("");		ss.str("");
	ss.clear();		ss.clear();