third_party/protobuf/src/google/protobuf/stubs/type_traits.h - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

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/stubs/type_traits.h

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Make chrome settings proto generated file a component Created 4 years 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/stubs/type_traits.h

diff --git a/third_party/protobuf/src/google/protobuf/stubs/type_traits.h b/third_party/protobuf/src/google/protobuf/stubs/type_traits.h

index 0d8127e504d4b16b146db499faa3c96f1686fb74..3ab5ea7d4eab50da566e855c729ae3d9b447c6ac 100644

--- a/third_party/protobuf/src/google/protobuf/stubs/type_traits.h

+++ b/third_party/protobuf/src/google/protobuf/stubs/type_traits.h

@@ -139,7 +139,7 @@ template<> struct is_integral<int> : true_type { };

template<> struct is_integral<unsigned int> : true_type { };

template<> struct is_integral<long> : true_type { };

template<> struct is_integral<unsigned long> : true_type { };

-#ifdef HAVE_LONG_LONG

+#if defined(HAVE_LONG_LONG) || defined(_MSC_VER)

template<> struct is_integral<long long> : true_type { };

template<> struct is_integral<unsigned long long> : true_type { };

#endif