finish re-sorting code and files

src/multi_array_operation.h

@@ -14,6 +14,8 @@
 
 #include "block/block.h"
 #include "operation_utils.h"
+#include "ranges/rheader.h"
+#include "pack_num.h"
 
 namespace MultiArrayTools
 {

src/operation_utils.cc

@@ -1,9 +1,15 @@
 
 #include "operation_utils.h"
+#include "ranges/range_base.h"
 
 namespace MultiArrayTools
 {
 
+    namespace
+    {
+	using namespace MultiArrayHelper;
+    }
+    
     void seekIndexInst(std::shared_ptr<VIWB> i, std::vector<std::shared_ptr<VIWB> >& ivec)
     {
 	for(size_t inum = 0; inum != i->rangePtr()->dim(); ++inum){

src/operation_utils.h

@@ -12,7 +12,12 @@
 
 namespace MultiArrayTools
 {
-       
+
+    namespace
+    {
+	using namespace MultiArrayHelper;
+    }
+    
     // <block type, step size within actual instance>
     typedef std::pair<BlockType,size_t> BTSS;
 

src/pack_num.h

@@ -24,13 +24,13 @@ namespace MultiArrayHelper
 	{
 	    auto subvec = std::move( std::get<N>(ops).block(idxPtr) );
 	    btv.insert(btv.end(), subvec.begin(), subvec.end() );
-	    BPackNum<N-1>::makeBlockTypeVec(btv, ops, idxPtr);
+	    PackNum<N-1>::makeBlockTypeVec(btv, ops, idxPtr);
 	}
 
 	template <typename T, class Func, class ArgTuple, class... Args>
 	static BlockResult<T> unpackArgs(const ArgTuple& tp, const Args&... args)
 	{
-	    return BPackNum<N-1>::template unpackArgs<T,Func>(tp, std::get<N>(tp).get(), args...);
+	    return PackNum<N-1>::template unpackArgs<T,Func>(tp, std::get<N>(tp).get(), args...);
 	}
 
 	template <typename... T>

src/ranges/range_base.h

@@ -13,7 +13,6 @@ namespace MultiArrayTools
 {
     class RangeBase;
 }
-
 #include "vindex_base.h"
 
 namespace MultiArrayTools

src/ranges/rpack_num.h

@@ -1,6 +1,6 @@
 
-#ifndef __pack_num_h__
-#define __pack_num_h__
+#ifndef __rpack_num_h__
+#define __rpack_num_h__
 
 #include <memory>
 #include "vindex_wrapper.h"

src/ranges/vindex_base.h

@@ -7,6 +7,10 @@
 
 namespace MultiArrayTools
 {
+
+#ifndef __range_base_h__
+    class RangeBase;
+#endif
     
     class VirtualIndexWrapperBase
     {