diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/internal.h | 1 | ||||
| -rw-r--r-- | src/core/lib/support/manual_constructor.h | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 5bca566dc2..60cc280c43 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -237,7 +237,6 @@ typedef enum { GRPC_CHTTP2_KEEPALIVE_STATE_DISABLED, } grpc_chttp2_keepalive_state; - struct grpc_chttp2_transport { grpc_transport base; /* must be first */ gpr_refcount refs; diff --git a/src/core/lib/support/manual_constructor.h b/src/core/lib/support/manual_constructor.h index 5ad07a6709..25731936b1 100644 --- a/src/core/lib/support/manual_constructor.h +++ b/src/core/lib/support/manual_constructor.h @@ -151,14 +151,16 @@ class PolymorphicManualConstructor { private: template <class DerivedType> void FinishInit(DerivedType* p) { - static_assert(manual_ctor_impl::is_one_of<DerivedType, DerivedTypes...>::value, - "DerivedType must be one of the predeclared DerivedTypes"); + static_assert( + manual_ctor_impl::is_one_of<DerivedType, DerivedTypes...>::value, + "DerivedType must be one of the predeclared DerivedTypes"); GPR_ASSERT(reinterpret_cast<BaseType*>(static_cast<DerivedType*>(p)) == p); } typename std::aligned_storage< grpc_core::manual_ctor_impl::max_size_of<DerivedTypes...>::value, - grpc_core::manual_ctor_impl::max_align_of<DerivedTypes...>::value>::type space_; + grpc_core::manual_ctor_impl::max_align_of<DerivedTypes...>::value>::type + space_; }; template <typename Type> |