From: myun2 Date: Sun, 8 Jul 2012 17:40:01 +0000 (+0900) Subject: binary_operation.hpp X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b8cc5c8f38a9a1f4dae7bc916384817fbfc863ff;p=roast%2Froast.git binary_operation.hpp --- diff --git a/roast/include/roast/math/expr/binary_operation.hpp b/roast/include/roast/math/expr/binary_operation.hpp index 715172f1..4f905d92 100644 --- a/roast/include/roast/math/expr/binary_operation.hpp +++ b/roast/include/roast/math/expr/binary_operation.hpp @@ -11,7 +11,7 @@ namespace roast { public: template - T1 _ROAST_ARITH_METHOD_NAME(const T1 &var1, const T2 &var2) { + T1 call(const T1 &var1, const T2 &var2) { return var1 + var2; } }; @@ -22,7 +22,7 @@ namespace roast { public: template - RET _ROAST_ARITH_METHOD_NAME(const T1 &var1, const T2 &var2) { + RET call(const T1 &var1, const T2 &var2) { return var1 - var2; } }; @@ -33,7 +33,7 @@ namespace roast { public: template - RET _ROAST_ARITH_METHOD_NAME(const T1 &var1, const T2 &var2) { + RET call(const T1 &var1, const T2 &var2) { return var1 * var2; } }; @@ -44,7 +44,7 @@ namespace roast { public: template - RET _ROAST_ARITH_METHOD_NAME(const T1 &var1, const T2 &var2) { + RET call(const T1 &var1, const T2 &var2) { return var1 / var2; } }; @@ -55,7 +55,7 @@ namespace roast { public: template - RET _ROAST_ARITH_METHOD_NAME(const T1 &var1, const T2 &var2) { + RET call(const T1 &var1, const T2 &var2) { return var1 % var2; } }; @@ -66,7 +66,7 @@ namespace roast { public: template - RET _ROAST_ARITH_METHOD_NAME(const T1 &var1, const T2 &var2) { + RET call(const T1 &var1, const T2 &var2) { return var1 << var2; } }; @@ -77,7 +77,7 @@ namespace roast { public: template - RET _ROAST_ARITH_METHOD_NAME(const T1 &var1, const T2 &var2) { + RET call(const T1 &var1, const T2 &var2) { return var1 >> var2; } }; @@ -88,7 +88,7 @@ namespace roast { public: template - RET _ROAST_ARITH_METHOD_NAME(const T1 &var1, const T2 &var2) { + RET call(const T1 &var1, const T2 &var2) { return var1 ^ var2; } };