aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/any.pb.cc
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2015-12-04 13:18:44 -0800
committerBo Yang <teboring@google.com>2015-12-08 14:43:45 -0800
commit1f0286a4046c264c19282f986759efe6b72679e7 (patch)
treee725991b57c33e14120e0c7c1bc493e8fcf46985 /src/google/protobuf/any.pb.cc
parentdbc91e979726573960374279653fc8ccc28dcc5f (diff)
downloadprotobuf-1f0286a4046c264c19282f986759efe6b72679e7.tar.gz
protobuf-1f0286a4046c264c19282f986759efe6b72679e7.tar.bz2
protobuf-1f0286a4046c264c19282f986759efe6b72679e7.zip
Use angle bracket for well known type proto header.
Diffstat (limited to 'src/google/protobuf/any.pb.cc')
-rw-r--r--src/google/protobuf/any.pb.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
index cbb5d233..321fd315 100644
--- a/src/google/protobuf/any.pb.cc
+++ b/src/google/protobuf/any.pb.cc
@@ -2,7 +2,7 @@
// source: google/protobuf/any.proto
#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "google/protobuf/any.pb.h"
+#include <google/protobuf/any.pb.h>
#include <algorithm>
@@ -119,10 +119,10 @@ bool Any::UnpackTo(::google::protobuf::Message* message) const {
return _any_metadata_.UnpackTo(message);
}
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
const int Any::kTypeUrlFieldNumber;
const int Any::kValueFieldNumber;
-#endif // !_MSC_VER
+#endif // !defined(_MSC_VER) || _MSC_VER >= 1900
Any::Any()
: ::google::protobuf::Message(), _internal_metadata_(NULL), _any_metadata_(&type_url_, &value_) {