third_party/protobuf/src/google/protobuf/stubs/port.h - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

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/port.h

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 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/stubs/platform_macros.h ('k') | third_party/protobuf/src/google/protobuf/stubs/statusor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/stubs/port.h

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

index 012ab21375d2ae5ad0bfcffe2bb8cd18f47e1fb9..80e60746531404a403c89661e3ff683034fddbbe 100644

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

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

@@ -53,7 +53,7 @@

#if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)

#define PROTOBUF_LITTLE_ENDIAN 1

#endif

- #if defined(_MSC_VER) && _MSC_VER >= 1300

+ #if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)

// If MSVC has "/RTCc" set, it will complain about truncating casts at

// runtime. This file contains some intentional truncating casts.

#pragma runtime_checks("c", off)