namespace reorg

7 files changed, 16 insertions, 2 deletions

diff --git a/src/cstore/cstore-c.cpp b/src/cstore/cstore-c.cpp
index 292ff38..50828c4 100644
--- a/src/cstore/cstore-c.cpp
+++ b/src/cstore/cstore-c.cpp
@@ -22,6 +22,8 @@
 #include <cstore/cstore.hpp>
 #include <cstore/cstore-c.h>
 
+using namespace cstore;
+
 static void
 _get_str_vec(vector<string>& vec, const char *strs[], int num_strs)
 {
diff --git a/src/cstore/cstore-varref.cpp b/src/cstore/cstore-varref.cpp
index ac80ba2..79ab56f 100644
--- a/src/cstore/cstore-varref.cpp
+++ b/src/cstore/cstore-varref.cpp
@@ -22,7 +22,7 @@
 #include <cli_cstore.h>
 #include <cstore/cstore-varref.hpp>
 
-using namespace std;
+using namespace cstore;
 
 ////// constructors/destructors
 Cstore::VarRef::VarRef(Cstore *cstore, const string& ref_str, bool active)
diff --git a/src/cstore/cstore-varref.hpp b/src/cstore/cstore-varref.hpp
index 7ab523f..3b842a9 100644
--- a/src/cstore/cstore-varref.hpp
+++ b/src/cstore/cstore-varref.hpp
@@ -22,7 +22,7 @@
 
 #include <cstore/cstore.hpp>
 
-using namespace std;
+namespace cstore { // begin namespace cstore
 
 class Cstore::VarRef {
 public:
@@ -44,5 +44,7 @@ private:
                    const vector<string>& cur_path_comps, vtw_type_e def_type);
 };
 
+} // end namespace cstore
+
 #endif /* _CSTORE_VARREF_H_ */
 
diff --git a/src/cstore/cstore.cpp b/src/cstore/cstore.cpp
index b6b55be..39c57cd 100644
--- a/src/cstore/cstore.cpp
+++ b/src/cstore/cstore.cpp
@@ -36,6 +36,7 @@
 #include <cnode/cnode-algorithm.hpp>
 #include <cparse/cparse.hpp>
 
+using namespace cstore;
 
 ////// constants
 //// node status
diff --git a/src/cstore/cstore.hpp b/src/cstore/cstore.hpp
index 9a41279..c76cb8f 100644
--- a/src/cstore/cstore.hpp
+++ b/src/cstore/cstore.hpp
@@ -45,6 +45,8 @@ extern "C" void* Perl_get_context(void)
 #define SAVE_PATHS save_paths(&__func__)
 #define RESTORE_PATHS restore_paths(&__func__)
 
+namespace cstore { // begin namespace cstore
+
 using namespace std;
 
 class Cstore {
@@ -495,5 +497,7 @@ private:
   static void vexit_internal(const char *fmt, va_list alist);
 };
 
+} // end namespace cstore
+
 #endif /* _CSTORE_H_ */
 
diff --git a/src/cstore/unionfs/cstore-unionfs.cpp b/src/cstore/unionfs/cstore-unionfs.cpp
index 233a111..59b5582 100644
--- a/src/cstore/unionfs/cstore-unionfs.cpp
+++ b/src/cstore/unionfs/cstore-unionfs.cpp
@@ -26,6 +26,7 @@
 #include <cli_cstore.h>
 #include <cstore/unionfs/cstore-unionfs.hpp>
 
+using namespace cstore;
 
 ////// constants
 // environment vars defining root dirs
diff --git a/src/cstore/unionfs/cstore-unionfs.hpp b/src/cstore/unionfs/cstore-unionfs.hpp
index 70d4cf6..29f6822 100644
--- a/src/cstore/unionfs/cstore-unionfs.hpp
+++ b/src/cstore/unionfs/cstore-unionfs.hpp
@@ -29,6 +29,8 @@
 #include <cli_cstore.h>
 #include <cstore/cstore.hpp>
 
+namespace cstore { // begin namespace cstore
+
 namespace b_fs = boost::filesystem;
 
 class UnionfsCstore : public Cstore {
@@ -231,5 +233,7 @@ private:
   };
 };
 
+} // end namespace cstore
+
 #endif /* _CSTORE_UNIONFS_H_ */