From bbf64cee3d6fece7da5992caf89da72bb1fd1a47 Mon Sep 17 00:00:00 2001 From: Yangqing Jia Date: Sat, 5 Dec 2015 18:36:18 -0800 Subject: Arena type traits standardization. This is adapted from the branch of @xfxyjwf at: https://github.com/xfxyjwf/protobuf/commit/494716a682ef854168e92231a3cdcc89d587d9b9 and should solve the protobuf compilation problem against nvcc. Tested against nvcc 6.5 and 7.0. --- src/google/protobuf/arena.h | 84 ++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 47 deletions(-) (limited to 'src') diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h index 16e0d50e..ac3d675b 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h @@ -490,27 +490,29 @@ class LIBPROTOBUF_EXPORT Arena { return GetArenaInternal(value, static_cast(0)); } - // Helper typetrait that indicates support for arenas in a type T at compile - // time. This is public only to allow construction of higher-level templated - // utilities. is_arena_constructable::value is an instance of - // google::protobuf::internal::true_type if the message type T has arena support enabled, and - // google::protobuf::internal::false_type otherwise. - // - // This is inside Arena because only Arena has the friend relationships - // necessary to see the underlying generated code traits. - template - struct is_arena_constructable { + private: + struct InternalIsArenaConstructableHelper { template static char ArenaConstructable( const typename U::InternalArenaConstructable_*); template static double ArenaConstructable(...); + }; - // This will resolve to either google::protobuf::internal::true_type or google::protobuf::internal::false_type. - typedef google::protobuf::internal::integral_constant(static_cast(0))) == - sizeof(char)> type; - static const type value; + public: + // Helper typetrait that indicates support for arenas in a type T at compile + // time. This is public only to allow construction of higher-level templated + // utilities. is_arena_constructable::value is true if the message type T + // has arena support enabled, and false otherwise. + // + // This is inside Arena because only Arena has the friend relationships + // necessary to see the underlying generated code traits. + template + struct is_arena_constructable : + public google::protobuf::internal::integral_constant(static_cast(0))) == + sizeof(char)> { }; private: @@ -572,32 +574,28 @@ class LIBPROTOBUF_EXPORT Arena { return google::protobuf::internal::has_trivial_destructor::value; } - // Helper typetrait that indicates whether the desctructor of type T should be - // called when arena is destroyed at compile time. This is only to allow - // construction of higher-level templated utilities. - // is_destructor_skippable::value is an instance of google::protobuf::internal::true_type if the - // destructor of the message type T should not be called when arena is - // destroyed or google::protobuf::internal::has_trivial_destructor::value == true, and - // google::protobuf::internal::false_type otherwise. - // - // This is inside Arena because only Arena has the friend relationships - // necessary to see the underlying generated code traits. - template - struct is_destructor_skippable { + struct InternalIsDestructorSkippableHelper { template static char DestructorSkippable( const typename U::DestructorSkippable_*); template static double DestructorSkippable(...); + }; - // The raw_skippable_value const bool variable is separated from the typedef - // line below as a work-around of an NVCC 7.0 (and earlier) compiler bug. - static const bool raw_skippable_value = - sizeof(DestructorSkippable(static_cast(0))) == - sizeof(char) || google::protobuf::internal::has_trivial_destructor::value == true; - // This will resolve to either google::protobuf::internal::true_type or google::protobuf::internal::false_type. - typedef google::protobuf::internal::integral_constant type; - static const type value; + // Helper typetrait that indicates whether the desctructor of type T should be + // called when arena is destroyed at compile time. This is only to allow + // construction of higher-level templated utilities. + // is_destructor_skippable::value is true if the destructor of the message + // type T should not be called when arena is destroyed or false otherwise. + // This is inside Arena because only Arena has the friend relationships + // necessary to see the underlying generated code traits. + template + struct is_destructor_skippable : + public google::protobuf::internal::integral_constant(static_cast(0))) == + sizeof(char) || + google::protobuf::internal::has_trivial_destructor::value> { }; @@ -780,8 +778,10 @@ class LIBPROTOBUF_EXPORT Arena { // which needs to declare google::protobuf::Map as friend of generated message. template static void CreateInArenaStorage(T* ptr, Arena* arena) { - CreateInArenaStorageInternal(ptr, arena, is_arena_constructable::value); - RegisterDestructorInternal(ptr, arena, is_destructor_skippable::value); + CreateInArenaStorageInternal( + ptr, arena, typename is_arena_constructable::type()); + RegisterDestructorInternal( + ptr, arena, typename is_destructor_skippable::type()); } template @@ -910,16 +910,6 @@ class LIBPROTOBUF_EXPORT Arena { // Defined above for supporting environments without RTTI. #undef RTTI_TYPE_ID -template -const typename Arena::is_arena_constructable::type - Arena::is_arena_constructable::value = - typename Arena::is_arena_constructable::type(); - -template -const typename Arena::is_destructor_skippable::type - Arena::is_destructor_skippable::value = - typename Arena::is_destructor_skippable::type(); - } // namespace protobuf } // namespace google -- cgit v1.2.3