From 9416c7cc5c6ccbe0cf4faa65346165c93f81ee91 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Sat, 23 Oct 2021 12:03:16 +0900 Subject: [PATCH] Removed Enabler2. --- include/msgpack/v3/adaptor/adaptor_base.hpp | 17 +++++++++-------- .../msgpack/v3/adaptor/adaptor_base_decl.hpp | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/msgpack/v3/adaptor/adaptor_base.hpp b/include/msgpack/v3/adaptor/adaptor_base.hpp index 180cca99..99af2779 100644 --- a/include/msgpack/v3/adaptor/adaptor_base.hpp +++ b/include/msgpack/v3/adaptor/adaptor_base.hpp @@ -32,14 +32,15 @@ struct pack : v2::adaptor::pack { }; template -struct object< - T, - Enabler, - typename msgpack::enable_if< - !msgpack::is_same::value && - !msgpack::is_array::value - >::type> - : v2::adaptor::object { +struct object + : v2::adaptor::object< + T, + typename msgpack::enable_if< + !msgpack::is_same::value && + !msgpack::is_array::value, + Enabler + >::type + > { }; template diff --git a/include/msgpack/v3/adaptor/adaptor_base_decl.hpp b/include/msgpack/v3/adaptor/adaptor_base_decl.hpp index f339f661..12f096a4 100644 --- a/include/msgpack/v3/adaptor/adaptor_base_decl.hpp +++ b/include/msgpack/v3/adaptor/adaptor_base_decl.hpp @@ -30,7 +30,7 @@ struct convert; template struct pack; -template +template struct object; template