Changes in src/Descriptors/AtomDescriptor_impl.hpp [7a1ce5:24a5e0]

File:

• src/Descriptors/AtomDescriptor_impl.hpp (modified) (7 diffs)

src/Descriptors/AtomDescriptor_impl.hpp

@@ +1 @@
+#ifndef ATOMDESCRIPTOR_IMPL_HPP
+#define ATOMDESCRIPTOR_IMPL_HPP
+
 #include "Descriptors/AtomDescriptor.hpp"
 
@@ -11 +14 @@
   virtual ~AtomDescriptor_impl();
 
-  virtual bool predicate(std::pair<int,atom*>)=0;
+  virtual bool predicate(std::pair<atomId_t,atom*>)=0;
 
 protected:
   virtual atom* find();
   virtual std::vector<atom*> findAll();
-  std::map<int,atom*>& getAtoms();
+  World::AtomSet& getAtoms();
 };
 
@@ -25 +28 @@
   AtomAllDescriptor_impl();
   virtual ~AtomAllDescriptor_impl();
-  virtual bool predicate(std::pair<int,atom*>);
+  virtual bool predicate(std::pair<atomId_t,atom*>);
 };
 
@@ -32 +35 @@
   AtomNoneDescriptor_impl();
   virtual ~AtomNoneDescriptor_impl();
-  virtual bool predicate(std::pair<int,atom*>);
+  virtual bool predicate(std::pair<atomId_t,atom*>);
 };
 
@@ -42 +45 @@
   AtomAndDescriptor_impl(AtomDescriptor::impl_ptr _lhs, AtomDescriptor::impl_ptr _rhs);
   ~AtomAndDescriptor_impl();
-  virtual bool predicate(std::pair<int,atom*>);
+  virtual bool predicate(std::pair<atomId_t,atom*>);
 
 private:
@@ -54 +57 @@
   AtomOrDescriptor_impl(AtomDescriptor::impl_ptr _lhs, AtomDescriptor::impl_ptr _rhs);
   virtual ~AtomOrDescriptor_impl();
-  virtual bool predicate(std::pair<int,atom*>);
+  virtual bool predicate(std::pair<atomId_t,atom*>);
 
 private:
@@ -67 +70 @@
   virtual ~AtomNotDescriptor_impl();
 
-  virtual bool predicate(std::pair<int,atom*>);
+  virtual bool predicate(std::pair<atomId_t,atom*>);
 
 private:
   AtomDescriptor::impl_ptr arg;
 };
+
+#endif //ATOMDESCRIPTOR_IMPL_HPP