aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/source_context.pb.cc
diff options
context:
space:
mode:
authorGravatar Bo Yang <teboring@google.com>2015-12-04 13:18:44 -0800
committerGravatar Bo Yang <teboring@google.com>2015-12-08 14:43:45 -0800
commit1f0286a4046c264c19282f986759efe6b72679e7 (patch)
treee725991b57c33e14120e0c7c1bc493e8fcf46985 /src/google/protobuf/source_context.pb.cc
parentdbc91e979726573960374279653fc8ccc28dcc5f (diff)
Use angle bracket for well known type proto header.
Diffstat (limited to 'src/google/protobuf/source_context.pb.cc')
-rw-r--r--src/google/protobuf/source_context.pb.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc
index c8397639..1be3297e 100644
--- a/src/google/protobuf/source_context.pb.cc
+++ b/src/google/protobuf/source_context.pb.cc
@@ -2,7 +2,7 @@
// source: google/protobuf/source_context.proto
#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "google/protobuf/source_context.pb.h"
+#include <google/protobuf/source_context.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 SourceContext::kFileNameFieldNumber;
-#endif // !_MSC_VER
+#endif // !defined(_MSC_VER) || _MSC_VER >= 1900
SourceContext::SourceContext()
: ::google::protobuf::Message(), _internal_metadata_(NULL) {