commit ebe754c2b11c6745e342a88d2db55ecdec268f9e parent 9c9c05b8f0a73204d223695d79b9ee8f736451e7 Author: d.levin256@gmail.com <d.levin256@gmail.com> Date: Wed, 5 Oct 2016 06:33:49 +0300 Move cinput_t/coutput_t from types.hpp to expression.hpp Diffstat:
M | include/kfr/base/expression.hpp | | | 18 | ++++++++++++++++++ |
M | include/kfr/base/types.hpp | | | 17 | ----------------- |
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/include/kfr/base/expression.hpp b/include/kfr/base/expression.hpp @@ -37,6 +37,24 @@ namespace kfr { +constexpr size_t inout_context_size = 16; + +struct coutput_context +{ + pconstvoid data[inout_context_size]; +}; + +struct cinput_context +{ + pconstvoid data[inout_context_size]; +}; + +using coutput_t = const coutput_context*; +using cinput_t = const cinput_context*; + +constexpr cinput_t cinput = nullptr; +constexpr coutput_t coutput = nullptr; + template <typename> struct complex; diff --git a/include/kfr/base/types.hpp b/include/kfr/base/types.hpp @@ -172,23 +172,6 @@ inline datatype operator&(datatype x, datatype y) return static_cast<datatype>(static_cast<type>(x) | static_cast<type>(y)); } -constexpr size_t inout_context_size = 16; - -struct coutput_context -{ - pconstvoid data[inout_context_size]; -}; - -struct cinput_context -{ - pconstvoid data[inout_context_size]; -}; - -using coutput_t = const coutput_context*; -using cinput_t = const cinput_context*; - -constexpr cinput_t cinput = nullptr; -constexpr coutput_t coutput = nullptr; template <typename T> constexpr datatype typeclass = std::is_floating_point<typename compound_type_traits<T>::subtype>::value