diff options
author | Bo Yang <teboring@google.com> | 2015-12-04 13:18:44 -0800 |
---|---|---|
committer | Bo Yang <teboring@google.com> | 2015-12-08 14:43:45 -0800 |
commit | 1f0286a4046c264c19282f986759efe6b72679e7 (patch) | |
tree | e725991b57c33e14120e0c7c1bc493e8fcf46985 /src/google/protobuf/field_mask.pb.cc | |
parent | dbc91e979726573960374279653fc8ccc28dcc5f (diff) |
Use angle bracket for well known type proto header.
Diffstat (limited to 'src/google/protobuf/field_mask.pb.cc')
-rw-r--r-- | src/google/protobuf/field_mask.pb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index d8f4ee91..f834363b 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -2,7 +2,7 @@ // source: google/protobuf/field_mask.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION -#include "google/protobuf/field_mask.pb.h" +#include <google/protobuf/field_mask.pb.h> #include <algorithm> @@ -110,9 +110,9 @@ static void MergeFromFail(int line) { // =================================================================== -#ifndef _MSC_VER +#if !defined(_MSC_VER) || _MSC_VER >= 1900 const int FieldMask::kPathsFieldNumber; -#endif // !_MSC_VER +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 FieldMask::FieldMask() : ::google::protobuf::Message(), _internal_metadata_(NULL) { |