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.h | |
| parent | 6a949cda379c0ee38cce1a926e2982d45f53dfce (diff) | |
| download | protobuf-javalite-d77877808fc9f00c3570353717d9659f8994ffc2.tar.gz | |
Fix thread local annotatoin and add back type traits is_convertable for MSVC
Diffstat (limited to 'src/google/protobuf/stubs/type_traits.h')
| -rw-r--r-- | src/google/protobuf/stubs/type_traits.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/type_traits.h b/src/google/protobuf/stubs/type_traits.h index f5365c38..0c294677 100644 --- a/src/google/protobuf/stubs/type_traits.h +++ b/src/google/protobuf/stubs/type_traits.h @@ -103,7 +103,7 @@ template <class T> struct remove_reference; template <class T> struct add_reference; template <class T> struct remove_pointer; template <class T, class U> struct is_same; -#if !defined(_MSC_VER) && !(defined(__GNUC__) && __GNUC__ <= 3) +#if !(defined(__GNUC__) && __GNUC__ <= 3) template <class From, class To> struct is_convertible; #endif @@ -322,7 +322,7 @@ template<typename T, typename U> struct is_same : public false_type { }; template<typename T> struct is_same<T, T> : public true_type { }; // Specified by TR1 [4.6] Relationships between types -#if !defined(_MSC_VER) && !(defined(__GNUC__) && __GNUC__ <= 3) +#if !(defined(__GNUC__) && __GNUC__ <= 3) namespace type_traits_internal { // This class is an implementation detail for is_convertible, and you |