diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-12-04 17:30:58 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-04 17:30:58 -0800 |
| commit | d77877808fc9f00c3570353717d9659f8994ffc2 (patch) | |
| tree | c26019d265d2409595b6bfcd7026cd5eb9bf7b11 /src/google/protobuf/stubs/type_traits_unittest.cc | |
| parent | 6a949cda379c0ee38cce1a926e2982d45f53dfce (diff) | |
Fix thread local annotatoin and add back type traits is_convertable for MSVC
Diffstat (limited to 'src/google/protobuf/stubs/type_traits_unittest.cc')
| -rw-r--r-- | src/google/protobuf/stubs/type_traits_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/type_traits_unittest.cc b/src/google/protobuf/stubs/type_traits_unittest.cc index b42b9e83..49c10ace 100644 --- a/src/google/protobuf/stubs/type_traits_unittest.cc +++ b/src/google/protobuf/stubs/type_traits_unittest.cc @@ -610,7 +610,7 @@ TEST(TypeTraitsTest, TestIsSame) { } TEST(TypeTraitsTest, TestConvertible) { -#if !defined(_MSC_VER) && !(defined(__GNUC__) && __GNUC__ <= 3) +#if !(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)); |