third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc - Issue 1422453005: Get VS 2015 to use const int definitions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc

Issue 1422453005: Get VS 2015 to use const int definitions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update README.chromium Created 5 years, 2 months 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_message.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc

index ef56b5e54925c1c0801c2ce5547db2fdbf2b9569..752f63f8c1f63a6777ba97a73b7fdaf3aa96541d 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_extension.cc

@@ -155,7 +155,7 @@ void ExtensionGenerator::GenerateDefinition(io::Printer* printer) {

// Likewise, class members need to declare the field constant variable.

if (descriptor_->extension_scope() != NULL) {

printer->Print(vars,

- "#ifndef _MSC_VER\n"

+ "#if !defined(_MSC_VER) || _MSC_VER >= 1900\n"

"const int $scope$$constant_name$;\n"

"#endif\n");

}