Move to standard integer types #1147

Foundation/include/Poco/BinaryReader.h

@@ -71,8 +71,10 @@ public:
 	BinaryReader& operator >> (unsigned short& value);
 	BinaryReader& operator >> (int& value);
 	BinaryReader& operator >> (unsigned int& value);
+#ifndef POCO_LONG_IS_64_BIT
 	BinaryReader& operator >> (long& value);
 	BinaryReader& operator >> (unsigned long& value);
+#endif // POCO_LONG_IS_64_BIT
 	BinaryReader& operator >> (float& value);
 	BinaryReader& operator >> (double& value);
 	BinaryReader& operator >> (Int64& value);

Foundation/include/Poco/BinaryWriter.h

@@ -76,8 +76,10 @@ public:
 	BinaryWriter& operator << (unsigned short value);
 	BinaryWriter& operator << (int value);
 	BinaryWriter& operator << (unsigned int value);
+#ifndef POCO_LONG_IS_64_BIT
 	BinaryWriter& operator << (long value);
 	BinaryWriter& operator << (unsigned long value);
+#endif // POCO_LONG_IS_64_BIT
 	BinaryWriter& operator << (float value);
 	BinaryWriter& operator << (double value);
 	BinaryWriter& operator << (Int64 value);

Foundation/include/Poco/NumberFormatter.h

@@ -98,6 +98,8 @@ public:
 		/// If prefix is true, "0x" prefix is prepended to the 
 		/// resulting string.
 
+#ifndef POCO_LONG_IS_64_BIT
+
 	static std::string format(long value);
 		/// Formats a long value in decimal notation.
 
@@ -150,6 +152,8 @@ public:
 		/// If prefix is true, "0x" prefix is prepended to the 
 		/// resulting string.
 
+#endif // POCO_LONG_IS_64_BIT
+
 	static std::string format(Int64 value);
 		/// Formats a 64-bit integer value in decimal notation.
 
@@ -277,6 +281,8 @@ public:
 		/// right justified and zero-padded in
 		/// a field having at least the specified width.
 
+#ifndef POCO_LONG_IS_64_BIT
+
 	static void append(std::string& str, long value);
 		/// Formats a long value in decimal notation.
 
@@ -321,6 +327,8 @@ public:
 		/// right justified and zero-padded in a field having at least the
 		/// specified width.
 
+#endif // POCO_LONG_IS_64_BIT
+
 	static void append(std::string& str, Int64 value);
 		/// Formats a 64-bit integer value in decimal notation.
 
@@ -482,6 +490,9 @@ inline std::string NumberFormatter::formatHex(unsigned value, int width, bool pr
 }
 
 
+#ifndef POCO_LONG_IS_64_BIT
+
+
 inline std::string NumberFormatter::format(long value)
 {
 	std::string result;
@@ -562,6 +573,9 @@ inline std::string NumberFormatter::formatHex(unsigned long value, int width, bo
 }
 
 
+#endif // POCO_LONG_IS_64_BIT
+
+
 inline std::string NumberFormatter::format(Int64 value)
 {
 	std::string result;

Foundation/src/BinaryReader.cpp

@@ -99,6 +99,9 @@ BinaryReader& BinaryReader::operator >> (unsigned int& value)
 }
 
 
+#ifndef POCO_LONG_IS_64_BIT
+
+
 BinaryReader& BinaryReader::operator >> (long& value)
 {
 #if defined(POCO_LONG_IS_64_BIT)
@@ -119,6 +122,9 @@ BinaryReader& BinaryReader::operator >> (unsigned long& value)
 }
 
 
+#endif // POCO_LONG_IS_64_BIT
+
+
 BinaryReader& BinaryReader::operator >> (float& value)
 {
 	return read(value, _flipBytes);

Foundation/src/BinaryWriter.cpp

@@ -99,6 +99,9 @@ BinaryWriter& BinaryWriter::operator << (unsigned int value)
 }
 
 
+#ifndef POCO_LONG_IS_64_BIT
+
+
 BinaryWriter& BinaryWriter::operator << (long value)
 {
 #if defined(POCO_LONG_IS_64_BIT)
@@ -119,6 +122,9 @@ BinaryWriter& BinaryWriter::operator << (unsigned long value)
 }
 
 
+#endif // POCO_LONG_IS_64_BIT
+
+
 BinaryWriter& BinaryWriter::operator << (float value)
 {
 	return write(value, _flipBytes);

Foundation/src/NumberFormatter.cpp

@@ -144,6 +144,9 @@ void NumberFormatter::appendHex(std::string& str, unsigned value, int width)
 }
 
 
+#ifndef POCO_LONG_IS_64_BIT
+
+
 void NumberFormatter::append(std::string& str, long value)
 {
 	char result[NF_MAX_INT_STRING_LEN];
@@ -234,6 +237,9 @@ void NumberFormatter::appendHex(std::string& str, unsigned long value, int width
 }
 
 
+#endif // POCO_LONG_IS_64_BIT
+
+
 void NumberFormatter::append(std::string& str, Int64 value)
 {
 	char result[NF_MAX_INT_STRING_LEN];