feat: #77 Fix build error XCode

skylicht-lab · Jun 10, 2020 · 3097db0 · 3097db0
1 parent bcad7f4
commit 3097db0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Projects/Skylicht/Engine/Source/Utils/CMemoryStream.cpp b/Projects/Skylicht/Engine/Source/Utils/CMemoryStream.cpp
@@ -95,12 +95,14 @@ namespace Skylicht
 		m_size += size;
 	}
 
+	/*
 	void CMemoryStream::writeLong(u64 data)
 	{
 		int size = sizeof(data);
 		memcpy(&m_memory[m_size], &data, size);
 		m_size += size;
 	}
+	*/
 
 	void CMemoryStream::writeFloat(float data)
 	{
@@ -172,6 +174,7 @@ namespace Skylicht
 		return ret;
 	}
 
+	/*
 	u64 CMemoryStream::readLong()
 	{
 		u64 ret = 0;
@@ -180,6 +183,7 @@ namespace Skylicht
 		m_pos += size;
 		return ret;
 	}
+	*/
 
 	float CMemoryStream::readFloat()
 	{

diff --git a/Projects/Skylicht/Engine/Source/Utils/CMemoryStream.h b/Projects/Skylicht/Engine/Source/Utils/CMemoryStream.h
@@ -48,7 +48,7 @@ namespace Skylicht
 		void writeChar(char data);
 		void writeShort(short data);
 		void writeInt(int data);
-		void writeLong(u64 data);
+		// void writeLong(u64 data);
 		void writeFloat(float data);
 		void writeDouble(double data);
 		void writeString(const std::string& s);
@@ -58,7 +58,7 @@ namespace Skylicht
 		char readChar();
 		short readShort();
 		int readInt();
-		u64 readLong();
+		// u64 readLong();
 		float readFloat();
 		double readDouble();
 		std::string readString();

diff --git a/UnitTest/TestApp/TestMemoryStream.cpp b/UnitTest/TestApp/TestMemoryStream.cpp
@@ -20,20 +20,18 @@ void testMemoryStream()
 	writeStream.writeInt(3);
 	writeStream.writeFloat(4.0f);
 	writeStream.writeDouble(5.0);
-	writeStream.writeLong(6);
 	writeStream.writeString(std::string("CMemoryStream"));
 	writeStream.writeData(testWrite, sizeof(testWrite));
 
 	int size = writeStream.getSize();
-	TEST_ASSERT_THROW(size == 57);
+	TEST_ASSERT_THROW(size == 49);
 
 	CMemoryStream readStream(writeStream.getData(), writeStream.getSize());
 	TEST_ASSERT_THROW(readStream.readChar() == 1);
 	TEST_ASSERT_THROW(readStream.readShort() == 2);
 	TEST_ASSERT_THROW(readStream.readInt() == 3);
 	TEST_ASSERT_FLOAT_EQUAL(readStream.readFloat(), 4.0f);
 	TEST_ASSERT_FLOAT_EQUAL(readStream.readDouble(), 5.0);
-	TEST_ASSERT_THROW(readStream.readLong() == 6);
 	TEST_ASSERT_STRING_EQUAL(readStream.readString().c_str(), "CMemoryStream");
 	readStream.readData(testRead, sizeof(int) * 3);
 	TEST_ASSERT_THROW(memcmp(testWrite, testRead, sizeof(int) * 3) == 0);