third_party/protobuf/src/google/protobuf/stubs/type_traits_unittest.cc - Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll).

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_unittest.cc

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: third_party/protobuf/src/google/protobuf/stubs/type_traits_unittest.cc

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

index 49c10aced62059e38dd8f05af747f65176a92786..7a8cbfb8b287a1698e214a72a4b8d2f5d0b4e9d1 100644

--- a/third_party/protobuf/src/google/protobuf/stubs/type_traits_unittest.cc

+++ b/third_party/protobuf/src/google/protobuf/stubs/type_traits_unittest.cc

@@ -41,10 +41,7 @@

#include <gtest/gtest.h>

typedef int int32;

-// IBM AIX typedefs `int64` in `sys/inttypes.h`, included transitively above.

-#ifndef _AIX

typedef long int64;

-#endif

using std::string;

using std::vector;

@@ -610,7 +607,7 @@ TEST(TypeTraitsTest, TestIsSame) {

}

TEST(TypeTraitsTest, TestConvertible) {

-#if !(defined(__GNUC__) && __GNUC__ <= 3)

+#if !defined(_MSC_VER) && !(defined(__GNUC__) && __GNUC__ <= 3)

EXPECT_TRUE((is_convertible<int, int>::value));

EXPECT_TRUE((is_convertible<int, long>::value));

EXPECT_TRUE((is_convertible<long, int>::value));