third_party/protobuf/src/google/protobuf/descriptor.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/descriptor.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:

Index: third_party/protobuf/src/google/protobuf/descriptor.cc

diff --git a/third_party/protobuf/src/google/protobuf/descriptor.cc b/third_party/protobuf/src/google/protobuf/descriptor.cc

index 7c121d9a3fd69e9e9d9d3788ca5413498a42c5a9..fb72e419fbbc4b3c4b332020791bd225c876fd72 100644

--- a/third_party/protobuf/src/google/protobuf/descriptor.cc

+++ b/third_party/protobuf/src/google/protobuf/descriptor.cc

@@ -131,7 +131,8 @@ const char * const FieldDescriptor::kLabelToName[MAX_LABEL + 1] = {

"repeated", // LABEL_REPEATED

};

-#ifndef _MSC_VER // MSVC doesn't need these and won't even accept them.

+// MSVC prior to VC 2015 doesn't need these and won't even accept them.

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

const int FieldDescriptor::kMaxNumber;

const int FieldDescriptor::kFirstReservedNumber;

const int FieldDescriptor::kLastReservedNumber;