arith.hpp: full_arithmetical_adapter -> 折角作った、add_sub_adapter, multiply_divide_adapte...

diff --git a/roast/include/roast/adapter/operator/arith/arith.hpp b/roast/include/roast/adapter/operator/arith/arith.hpp
index f912229..6227ca1 100644 (file)
--- a/roast/include/roast/adapter/operator/arith/arith.hpp
+++ b/roast/include/roast/adapter/operator/arith/arith.hpp
@@ -70,10 +70,8 @@ namespace roast
                template <typename _Facade, typename _ValueType>
                class full_arithmetical_adapter :
                        public incr_decr_adapter<_Facade>,
-                       public additional_adapter<_Facade, _ValueType>,
-                       public subtractional_adapter<_Facade, _ValueType>,
-                       public multiplicational_adapter<_Facade, _ValueType>,
-                       public divisional_adapter<_Facade, _ValueType>
+                       public add_sub_adapter<_Facade, _ValueType>,
+                       public multiply_divide_adapter<_Facade, _ValueType>
                {};
                
                ///////////////////////////////////////////////
@@ -81,18 +79,14 @@ namespace roast
                template <typename _Facade, typename _ValueType>
                class value_full_arithmetical_adapter : 
                        public value_incr_decr_adapter<_Facade, _ValueType>,
-                       public value_additional_adapter<_Facade, _ValueType>,
-                       public value_subtractional_adapter<_Facade, _ValueType>,
-                       public value_multiplicational_adapter<_Facade, _ValueType>,
-                       public value_divisional_adapter<_Facade, _ValueType>
+                       public value_add_sub_adapter<_Facade, _ValueType>,
+                       public value_multiply_divide_adapter<_Facade, _ValueType>
                {
                public:
                        value_full_arithmetical_adapter(_ValueType& value_ref) :
                                value_incr_decr_adapter<_Facade, _ValueType>(value_ref),
-                               value_additional_adapter<_Facade, _ValueType>(value_ref),
-                               value_subtractional_adapter<_Facade, _ValueType>(value_ref),
-                               value_multiplicational_adapter<_Facade, _ValueType>(value_ref),
-                               value_divisional_adapter<_Facade, _ValueType>(value_ref)
+                               value_add_sub_adapter<_Facade, _ValueType>(value_ref),
+                               value_multiply_divide_adapter<_Facade, _ValueType>(value_ref)
                                {}
                };