iterator_adapter の場所移し替えてみた

diff --git a/roast/include/roast/adapter/iterator_adapter.hpp b/roast/include/roast/adapter/iterator_adapter.hpp
index aca25b4..684463d 100644 (file)
--- a/roast/include/roast/adapter/iterator_adapter.hpp
+++ b/roast/include/roast/adapter/iterator_adapter.hpp
@@ -3,20 +3,7 @@
 #ifndef __SFJP_ROAST__adapter__iterator_adapter_HPP__
 #define __SFJP_ROAST__adapter__iterator_adapter_HPP__
 
-#include "roast/adapter/operator_adapter.hpp"
-
-namespace roast
-{
-       template <typename _Body>
-       class incremental_iterator_adapter : public _Body,
-               value_incremental_adapter<incremental_iterator_adapter<_Body>, typename _Body::value_type>,
-               value_cast_adapter<typename _Body::value_type, typename _Body::value_type>
-       {
-       public:
-               incremental_iterator_adapter() : value_incremental_adapter<inc_test, int>(value), value_cast_adapter<int, int>(value), value_cast_adapter<int, long>(value){ value = 0; }
-               incremental_iterator_adapter(const incremental_iterator_adapter& from) : value_incremental_adapter<inc_test, int>(value), value_cast_adapter<int, int>(value), value_cast_adapter<int, long>(value){ value = from.value; }
-       };
-}
+#include "roast/iterator/iterator_adapter.hpp"
 
 #endif//__SFJP_ROAST__adapter__iterator_adapter_HPP__
 

diff --git a/roast/include/roast/iterator/iterator_adapter.hpp b/roast/include/roast/iterator/iterator_adapter.hpp
index 2afd2cd..ce67daa 100644 (file)
--- a/roast/include/roast/iterator/iterator_adapter.hpp
+++ b/roast/include/roast/iterator/iterator_adapter.hpp
@@ -3,7 +3,22 @@
 #ifndef __SFJP_ROAST__iterator__iterator_adapter_HPP__
 #define __SFJP_ROAST__iterator__iterator_adapter_HPP__
 
-#include "roast/adapter/iterator_adapter.hpp"
+//#include "roast/adapter/iterator_adapter.hpp"
+
+#include "roast/adapter/operator_adapter.hpp"
+
+namespace roast
+{
+       template <typename _Body>
+       class incremental_iterator_adapter : public _Body,
+               value_incremental_adapter<incremental_iterator_adapter<_Body>, typename _Body::value_type>,
+               value_cast_adapter<typename _Body::value_type, typename _Body::value_type>
+       {
+       public:
+               incremental_iterator_adapter() : value_incremental_adapter<inc_test, int>(value), value_cast_adapter<int, int>(value), value_cast_adapter<int, long>(value){ value = 0; }
+               incremental_iterator_adapter(const incremental_iterator_adapter& from) : value_incremental_adapter<inc_test, int>(value), value_cast_adapter<int, int>(value), value_cast_adapter<int, long>(value){ value = from.value; }
+       };
+}
 
 #endif//__SFJP_ROAST__iterator__iterator_adapter_HPP__