aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-05-06 22:17:46 +0000
committerkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-05-06 22:17:46 +0000
commit1d4df6caa4cbf39fec64e3d8f8acb8d2946e0813 (patch)
treec2ad86edbed4abe4e36ebe083212c70173a553c3
parente21c5734ecf61c21aa8393a8fbfb55aed8d486d6 (diff)
downloadprotobuf-1d4df6caa4cbf39fec64e3d8f8acb8d2946e0813.tar.gz
protobuf-1d4df6caa4cbf39fec64e3d8f8acb8d2946e0813.tar.bz2
protobuf-1d4df6caa4cbf39fec64e3d8f8acb8d2946e0813.zip
Fix compile error on Cygwin, where int32 is typedefed to long instead of int, and the compiler can't figure out which overload of this method to use in that case.
-rw-r--r--src/google/protobuf/stubs/common.cc2
-rw-r--r--src/google/protobuf/stubs/common.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/google/protobuf/stubs/common.cc b/src/google/protobuf/stubs/common.cc
index da73c566..302be7ae 100644
--- a/src/google/protobuf/stubs/common.cc
+++ b/src/google/protobuf/stubs/common.cc
@@ -145,6 +145,8 @@ DECLARE_STREAM_OPERATOR(const char* , )
DECLARE_STREAM_OPERATOR(char , SimpleCtoa)
DECLARE_STREAM_OPERATOR(int , SimpleItoa)
DECLARE_STREAM_OPERATOR(uint , SimpleItoa)
+DECLARE_STREAM_OPERATOR(long , SimpleItoa)
+DECLARE_STREAM_OPERATOR(unsigned long, SimpleItoa)
DECLARE_STREAM_OPERATOR(double , SimpleDtoa)
#undef DECLARE_STREAM_OPERATOR
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index 3367d4ce..96be91b7 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -586,6 +586,8 @@ class LIBPROTOBUF_EXPORT LogMessage {
LogMessage& operator<<(char value);
LogMessage& operator<<(int value);
LogMessage& operator<<(uint value);
+ LogMessage& operator<<(long value);
+ LogMessage& operator<<(unsigned long value);
LogMessage& operator<<(double value);
private: