From 16306fed82483ee6d850bd14d2415fb125c7eb3a Mon Sep 17 00:00:00 2001 From: bolero-MURAKAMI Date: Sat, 17 Nov 2012 21:47:52 +0900 Subject: [PATCH] rename synthesized -> superposed --- sprout/compost/effects.hpp | 2 +- .../{synthesized.hpp => superposed.hpp} | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) rename sprout/compost/effects/{synthesized.hpp => superposed.hpp} (62%) diff --git a/sprout/compost/effects.hpp b/sprout/compost/effects.hpp index adda7b9d..bd4321fb 100644 --- a/sprout/compost/effects.hpp +++ b/sprout/compost/effects.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/sprout/compost/effects/synthesized.hpp b/sprout/compost/effects/superposed.hpp similarity index 62% rename from sprout/compost/effects/synthesized.hpp rename to sprout/compost/effects/superposed.hpp index 27e748ef..e47752be 100644 --- a/sprout/compost/effects/synthesized.hpp +++ b/sprout/compost/effects/superposed.hpp @@ -1,5 +1,5 @@ -#ifndef SPROUT_COMPOST_EFFECTS_SYNTHESIZED_HPP -#define SPROUT_COMPOST_EFFECTS_SYNTHESIZED_HPP +#ifndef SPROUT_COMPOST_EFFECTS_SUPERPOSED_HPP +#define SPROUT_COMPOST_EFFECTS_SUPERPOSED_HPP #include #include @@ -11,18 +11,18 @@ namespace sprout { namespace compost { namespace effects { // - // synthesize_holder + // superpose_holder // template - class synthesize_holder { + class superpose_holder { public: typedef RRange range2_type; private: sprout::value_holder range_; public: - synthesize_holder() = default; - synthesize_holder(synthesize_holder const&) = default; - explicit SPROUT_CONSTEXPR synthesize_holder(range2_type& range) + superpose_holder() = default; + superpose_holder(superpose_holder const&) = default; + explicit SPROUT_CONSTEXPR superpose_holder(range2_type& range) : range_(range) {} SPROUT_CONSTEXPR range2_type& range() const { @@ -31,16 +31,16 @@ namespace sprout { }; // - // synthesized_forwarder + // superposed_forwarder // - class synthesized_forwarder { + class superposed_forwarder { public: template - SPROUT_CONSTEXPR sprout::compost::effects::synthesize_holder< + SPROUT_CONSTEXPR sprout::compost::effects::superpose_holder< typename std::remove_reference::type>::type > operator()(RRange&& range) { - return sprout::compost::effects::synthesize_holder< + return sprout::compost::effects::superpose_holder< typename std::remove_reference::type>::type >( sprout::lvalue_forward(range) @@ -49,10 +49,10 @@ namespace sprout { }; // - // synthesized + // superposed // namespace { - SPROUT_STATIC_CONSTEXPR sprout::compost::effects::synthesized_forwarder synthesized{}; + SPROUT_STATIC_CONSTEXPR sprout::compost::effects::superposed_forwarder superposed{}; } // anonymous-namespace // @@ -60,7 +60,7 @@ namespace sprout { // template inline SPROUT_CONSTEXPR auto - operator|(Range&& lhs, sprout::compost::effects::synthesize_holder const& rhs) + operator|(Range&& lhs, sprout::compost::effects::superpose_holder const& rhs) -> decltype( sprout::forward(lhs) | sprout::adaptors::transformed(rhs.range(), sprout::plus<>()) @@ -74,4 +74,4 @@ namespace sprout { } // namespace compost } // namespace sprout -#endif // #ifndef SPROUT_COMPOST_EFFECTS_SYNTHESIZED_HPP +#endif // #ifndef SPROUT_COMPOST_EFFECTS_SUPERPOSED_HPP