背景和头像缺失

Classes/Define/DataStream.h

@@ -171,13 +171,16 @@ public:
 
 	DataStream& pushValue(long value)
 	{
-		push(value);
+		push((int)value);
 		return *this;
 	}
 
 	DataStream& popValue(long& value)
 	{
-		return pop(value);
+		int kTempValue = 0;
+		pop(kTempValue);
+		value = kTempValue;
+		return *this;
 	}
 
 	DataStream& pushValue(long long value)
@@ -207,25 +210,15 @@ public:
 	{
 		return pop(value);
 	} 
-#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
 	DataStream& pushValue(unsigned long value)
 	{
-		push((unsigned int)value);
+		push(value);
 		return *this;
 	}  
 	DataStream& popValue(unsigned long& value)
 	{
-		if (size() <= sizeof(unsigned int))
-		{
-			return *this;
-		}
-
-		unsigned int kTempValue = 0; 
-		pop(kTempValue);
-		value = kTempValue;
-		return *this;
+		return pop(value);
 	} 
-#endif
 	DataStream& pushValue(unsigned char value)
 	{
 		return push(value);
@@ -262,7 +255,7 @@ public:
 		return pop(value);
 	}
 
-	//std::vector´¦Àí
+	//std::vector<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	template<typename C>
 	DataStream& pushValue(const std::vector<C>& data)
 	{
@@ -329,7 +322,7 @@ private:
 		{
 			return *this;
 		}
-		memcpy(&data, &operator[](0), sizeof(data));
+		memcpy((void*)&data, (void*)&operator[](0), sizeof(data));
 		erase(begin(), begin()+sizeof(data));
 		return *this;
 	}