droped namespace around dynamic bitset

rleap-project · Nov 21, 2023 · 206b51b · 206b51b
1 parent eee4aba
commit 206b51b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 33 deletions.
diff --git a/include/dlplan/core.h b/include/dlplan/core.h
@@ -129,7 +129,7 @@ struct hash_impl<std::vector<int>> {
 class ConceptDenotation {
 private:
     int m_num_objects;
-    dlplan::utils::DynamicBitset<unsigned> m_data;
+    DynamicBitset<unsigned> m_data;
 
 public:
     explicit ConceptDenotation(int num_objects);
@@ -195,7 +195,7 @@ class ConceptDenotation {
 class RoleDenotation {
 private:
     int m_num_objects;
-    dlplan::utils::DynamicBitset<unsigned> m_data;
+    DynamicBitset<unsigned> m_data;
 
 public:
     explicit RoleDenotation(int num_objects);

diff --git a/include/dlplan/utils/dynamic_bitset.h b/include/dlplan/utils/dynamic_bitset.h
@@ -10,24 +10,10 @@
 #include <vector>
 
 
-namespace dlplan::utils {
-template<typename Block>
-class DynamicBitset;
-}
-
-
-namespace boost::serialization {
-    class access;
-
-    template <typename Archive, typename Block>
-    void serialize(Archive& ar, dlplan::utils::DynamicBitset<Block>& t, const unsigned int version);
-}
-
-
 /*
   Poor man's version of boost::dynamic_bitset, mostly copied from there.
 */
-namespace dlplan::utils {
+namespace dlplan {
 
 template<typename Block = unsigned int>
 class DynamicBitset {
@@ -74,11 +60,7 @@ class DynamicBitset {
     }
 
     /// @brief Constructor for serialization.
-    DynamicBitset() : blocks(std::vector<Block>()), num_bits(0) { }
-
-    friend class boost::serialization::access;
-    template<typename Archive, typename Block_>
-    friend void boost::serialization::serialize(Archive& ar, DynamicBitset<Block_>& t, const unsigned int version);
+    //DynamicBitset() : blocks(std::vector<Block>()), num_bits(0) { }
 
 public:
     explicit DynamicBitset(std::size_t num_bits)
@@ -212,15 +194,6 @@ template<typename Block>
 const Block DynamicBitset<Block>::ones = ~DynamicBitset<Block>::zeros;
 }
 
-namespace boost::serialization {
-
-template<typename Archive, typename Block>
-void serialize(Archive& ar, dlplan::utils::DynamicBitset<Block>& t, const unsigned int /* version */) {
-    ar & t.blocks;
-    ar & t.num_bits;
-}
-
-}
 
 /*
 This source file was derived from the boost::dynamic_bitset library

diff --git a/src/core/concept_denotation.cpp b/src/core/concept_denotation.cpp
@@ -12,7 +12,7 @@
 
 namespace dlplan::core {
 ConceptDenotation::ConceptDenotation(int num_objects)
-    : m_num_objects(num_objects), m_data(utils::DynamicBitset<unsigned>(num_objects)) { }
+    : m_num_objects(num_objects), m_data(DynamicBitset<unsigned>(num_objects)) { }
 
 ConceptDenotation::ConceptDenotation(const ConceptDenotation& other) = default;
 

diff --git a/src/core/role_denotation.cpp b/src/core/role_denotation.cpp
@@ -10,7 +10,7 @@
 namespace dlplan::core {
 
 RoleDenotation::RoleDenotation(int num_objects)
-    : m_num_objects(num_objects), m_data(utils::DynamicBitset<unsigned>(num_objects * num_objects)) { }
+    : m_num_objects(num_objects), m_data(DynamicBitset<unsigned>(num_objects * num_objects)) { }
 
 RoleDenotation::RoleDenotation(const RoleDenotation& other) = default;