Fixed compilation warnings

marcizhu · Mar 2, 2019 · 40864ca · 40864ca
1 parent 0ffdb19
commit 40864ca
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/Cereal/Cereal/src/Array.h b/Cereal/Cereal/src/Array.h
@@ -139,7 +139,6 @@ namespace Cereal {
 			{
 				data = new byte[count * sizeOf(dataType)];
 				buffer.copyTo(data, count * sizeOf(dataType));
-				buffer.addOffset(count * sizeOf(dataType));
 			}
 			else
 			{
@@ -150,7 +149,6 @@ namespace Cereal {
 
 				data = new byte[size];
 				buffer.copyTo(data, size);
-				buffer.addOffset(size);
 			}
 		}
 

diff --git a/Cereal/Cereal/src/Buffer.h b/Cereal/Cereal/src/Buffer.h
@@ -149,14 +149,16 @@ namespace Cereal {
 		template<>
 		bool writeBytes<float>(float data)
 		{
-			unsigned int x = *(unsigned int*)&data;
+			unsigned int x;
+			*(unsigned int*)&x = *(unsigned int*)&data;
 			return writeBytes<unsigned int>(x);
 		}
 
 		template<>
 		bool writeBytes<double>(double data)
 		{
-			unsigned long long x = *(unsigned long long*)&data;
+			unsigned long long x;
+			*(unsigned long long*)&x = *(unsigned long long*)&data;
 			return writeBytes<unsigned long long>(x);
 		}
 #endif
@@ -326,14 +328,16 @@ namespace Cereal {
 	template<>
 	inline bool Buffer::writeBytes<float>(float data)
 	{
-		unsigned int x = *(unsigned int*)&data;
+		unsigned int x;
+		*(unsigned int*)&x = *(unsigned int*)&data;
 		return writeBytes<unsigned int>(x);
 	}
 
 	template<>
 	inline bool Buffer::writeBytes<double>(double data)
 	{
-		unsigned long long x = *(unsigned long long*)&data;
+		unsigned long long x;
+		*(unsigned long long*)&x = *(unsigned long long*)&data;
 		return writeBytes<unsigned long long>(x);
 	}
 #endif

diff --git a/Cereal/Cereal/src/Reader.h b/Cereal/Cereal/src/Reader.h
@@ -50,7 +50,6 @@ namespace Cereal {
 			}
 
 			float result;
-
 			memcpy(&result, &value, sizeof(float));
 
 			return result;
@@ -104,7 +103,6 @@ namespace Cereal {
 		}
 
 		float result;
-
 		memcpy(&result, &value, sizeof(float));
 
 		return result;

diff --git a/Cereal/Cereal/src/Writer.h b/Cereal/Cereal/src/Writer.h
@@ -57,14 +57,16 @@ namespace Cereal {
 		template<>
 		static unsigned int writeBytes<float>(byte* dest, unsigned int pointer, float data)
 		{
-			unsigned int x = *(unsigned int*)&data;
+			unsigned int x;
+			*(unsigned int*)&x = *(unsigned int*)&data;
 			return writeBytes<unsigned int>(dest, pointer, x);
 		}
 
 		template<>
 		static unsigned int writeBytes<double>(byte* dest, unsigned int pointer, double data)
 		{
-			unsigned long long x = *(unsigned long long*)&data;
+			unsigned long long x;
+			*(unsigned long long*)&x = *(unsigned long long*)&data;
 			return writeBytes<unsigned long long>(dest, pointer, x);
 		}
 #endif
@@ -91,14 +93,16 @@ namespace Cereal {
 	template<>
 	inline unsigned int Writer::writeBytes<float>(byte* dest, unsigned int pointer, float data)
 	{
-		unsigned int x = *(unsigned int*)&data;
+		unsigned int x;
+		*(unsigned int*)&x = *(unsigned int*)&data;
 		return writeBytes<unsigned int>(dest, pointer, x);
 	}
 
 	template<>
 	inline unsigned int Writer::writeBytes<double>(byte* dest, unsigned int pointer, double data)
 	{
-		unsigned long long x = *(unsigned long long*)&data;
+		unsigned long long x;
+		*(unsigned long long*)&x = *(unsigned long long*)&data;
 		return writeBytes<unsigned long long>(dest, pointer, x);
 	}
 #endif