Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(396)

Side by Side Diff: third_party/protobuf/src/google/protobuf/stubs/common.h

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Make chrome settings proto generated file a component Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2008 Google Inc. All rights reserved.
3 // https://developers.google.com/protocol-buffers/ 3 // https://developers.google.com/protocol-buffers/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 namespace google { 90 namespace google {
91 namespace protobuf { 91 namespace protobuf {
92 namespace internal { 92 namespace internal {
93 93
94 // Some of these constants are macros rather than const ints so that they can 94 // Some of these constants are macros rather than const ints so that they can
95 // be used in #if directives. 95 // be used in #if directives.
96 96
97 // The current version, represented as a single integer to make comparison 97 // The current version, represented as a single integer to make comparison
98 // easier: major * 10^6 + minor * 10^3 + micro 98 // easier: major * 10^6 + minor * 10^3 + micro
99 #define GOOGLE_PROTOBUF_VERSION 3000000 99 #define GOOGLE_PROTOBUF_VERSION 3001000
100
101 // A suffix string for alpha, beta or rc releases. Empty for stable releases.
102 #define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
100 103
101 // The minimum library version which works with the current version of the 104 // The minimum library version which works with the current version of the
102 // headers. 105 // headers.
103 #define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3000000 106 #define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3001000
104 107
105 // The minimum header version which works with the current version of 108 // The minimum header version which works with the current version of
106 // the library. This constant should only be used by protoc's C++ code 109 // the library. This constant should only be used by protoc's C++ code
107 // generator. 110 // generator.
108 static const int kMinHeaderVersionForLibrary = 3000000; 111 static const int kMinHeaderVersionForLibrary = 3001000;
109 112
110 // The minimum protoc version which works with the current version of the 113 // The minimum protoc version which works with the current version of the
111 // headers. 114 // headers.
112 #define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3000000 115 #define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3001000
113 116
114 // The minimum header version which works with the current version of 117 // The minimum header version which works with the current version of
115 // protoc. This constant should only be used in VerifyVersion(). 118 // protoc. This constant should only be used in VerifyVersion().
116 static const int kMinHeaderVersionForProtoc = 3000000; 119 static const int kMinHeaderVersionForProtoc = 3001000;
117 120
118 // Verifies that the headers and libraries are compatible. Use the macro 121 // Verifies that the headers and libraries are compatible. Use the macro
119 // below to call this. 122 // below to call this.
120 void LIBPROTOBUF_EXPORT VerifyVersion(int headerVersion, int minLibraryVersion, 123 void LIBPROTOBUF_EXPORT VerifyVersion(int headerVersion, int minLibraryVersion,
121 const char* filename); 124 const char* filename);
122 125
123 // Converts a numeric version number to a string. 126 // Converts a numeric version number to a string.
124 std::string LIBPROTOBUF_EXPORT VersionString(int version); 127 std::string LIBPROTOBUF_EXPORT VersionString(int version);
125 128
126 } // namespace internal 129 } // namespace internal
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 #endif 219 #endif
217 220
218 // This is at the end of the file instead of the beginning to work around a bug 221 // This is at the end of the file instead of the beginning to work around a bug
219 // in some versions of MSVC. 222 // in some versions of MSVC.
220 using namespace std; // Don't do this at home, kids. 223 using namespace std; // Don't do this at home, kids.
221 224
222 } // namespace protobuf 225 } // namespace protobuf
223 } // namespace google 226 } // namespace google
224 227
225 #endif // GOOGLE_PROTOBUF_COMMON_H__ 228 #endif // GOOGLE_PROTOBUF_COMMON_H__
OLDNEW
« no previous file with comments | « third_party/protobuf/src/google/protobuf/stubs/callback.h ('k') | third_party/protobuf/src/google/protobuf/stubs/common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698