diff options
author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-07 19:08:05 +0000 |
---|---|---|
committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-07 19:08:05 +0000 |
commit | 83964a9ab481a245274c6a13584df5038480037d (patch) | |
tree | ccee6b7e5cb4ba8fdf346c1b03e59fdc5573a75e /src/google/protobuf/wire_format_lite_inl.h | |
parent | 7db9c098df1c73c6b35c23519d53ec3f92315db9 (diff) |
1, Add comments for include<algorithm> we added for min/max on VS2013. 2, Add #if/#endif to wrap #undef
Diffstat (limited to 'src/google/protobuf/wire_format_lite_inl.h')
-rw-r--r-- | src/google/protobuf/wire_format_lite_inl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/wire_format_lite_inl.h b/src/google/protobuf/wire_format_lite_inl.h index 2b5763ce..ca367f59 100644 --- a/src/google/protobuf/wire_format_lite_inl.h +++ b/src/google/protobuf/wire_format_lite_inl.h @@ -37,6 +37,7 @@ #define GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__ #ifdef _MSC_VER +// This is required for min/max on VS2013 only. #include <algorithm> #endif |