Эх сурвалжийг харах

Avoid using the macro name again in macro definitions.

Feng Xiao 11 жил өмнө
parent
commit
3b8dadf581

+ 3 - 3
src/google/protobuf/wire_format_lite.h

@@ -239,9 +239,9 @@ class LIBPROTOBUF_EXPORT WireFormatLite {
   // that file to use these.
   // that file to use these.
 
 
 // Avoid ugly line wrapping
 // Avoid ugly line wrapping
-#define input  io::CodedInputStream*  input
-#define output io::CodedOutputStream* output
-#define field_number int field_number
+#define input  io::CodedInputStream*  input_arg
+#define output io::CodedOutputStream* output_arg
+#define field_number int field_number_arg
 #define INL GOOGLE_ATTRIBUTE_ALWAYS_INLINE
 #define INL GOOGLE_ATTRIBUTE_ALWAYS_INLINE
 
 
   // Read fields, not including tags.  The assumption is that you already
   // Read fields, not including tags.  The assumption is that you already