Changeset 98a2987 for molecuilder/src/Descriptors

Timestamp:

Feb 26, 2010, 12:40:52 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

e65cc0

Parents:

33bc66

Message:

Added -Wall flag and fixed several small hickups

Location:

molecuilder/src/Descriptors

Files:

• AtomDescriptor.cpp (modified) (5 diffs)
• AtomDescriptor_impl.hpp (modified) (6 diffs)
• AtomIdDescriptor.cpp (modified) (1 diff)
• AtomIdDescriptor_impl.hpp (modified) (1 diff)
• AtomTypeDescriptor.cpp (modified) (1 diff)
• AtomTypeDescriptor_impl.hpp (modified) (1 diff)

molecuilder/src/Descriptors/AtomDescriptor.cpp

@@ -97 +97 @@
 {}
 
-bool AtomAllDescriptor_impl::predicate(std::pair<int,atom*>){
+bool AtomAllDescriptor_impl::predicate(std::pair<atomId_t,atom*>){
   return true;
 }
@@ -111 +111 @@
 {}
 
-bool AtomNoneDescriptor_impl::predicate(std::pair<int,atom*>){
+bool AtomNoneDescriptor_impl::predicate(std::pair<atomId_t,atom*>){
   return false;
 }
@@ -129 +129 @@
 {}
 
-bool AtomAndDescriptor_impl::predicate(std::pair<int,atom*> atom){
+bool AtomAndDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
   return lhs->predicate(atom) && rhs->predicate(atom);
 }
@@ -145 +145 @@
 }
 
-bool AtomOrDescriptor_impl::predicate(std::pair<int,atom*> atom){
+bool AtomOrDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
   return lhs->predicate(atom) || rhs->predicate(atom);
 }
@@ -165 +165 @@
 }
 
-bool AtomNotDescriptor_impl::predicate(std::pair<int,atom*> atom){
+bool AtomNotDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
  return !(arg->predicate(atom));
 }

molecuilder/src/Descriptors/AtomDescriptor_impl.hpp

@@ -14 +14 @@
   virtual ~AtomDescriptor_impl();
 
-  virtual bool predicate(std::pair<int,atom*>)=0;
+  virtual bool predicate(std::pair<atomId_t,atom*>)=0;
 
 protected:
@@ -28 +28 @@
   AtomAllDescriptor_impl();
   virtual ~AtomAllDescriptor_impl();
-  virtual bool predicate(std::pair<int,atom*>);
+  virtual bool predicate(std::pair<atomId_t,atom*>);
 };
 
@@ -35 +35 @@
   AtomNoneDescriptor_impl();
   virtual ~AtomNoneDescriptor_impl();
-  virtual bool predicate(std::pair<int,atom*>);
+  virtual bool predicate(std::pair<atomId_t,atom*>);
 };
 
@@ -45 +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:
@@ -57 +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:
@@ -70 +70 @@
   virtual ~AtomNotDescriptor_impl();
 
-  virtual bool predicate(std::pair<int,atom*>);
+  virtual bool predicate(std::pair<atomId_t,atom*>);
 
 private:

molecuilder/src/Descriptors/AtomIdDescriptor.cpp

@@ -21 +21 @@
 {}
 
-bool AtomIdDescriptor_impl::predicate(std::pair<int,atom*> atom) {
+bool AtomIdDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom) {
   return atom.first==id;
 }

molecuilder/src/Descriptors/AtomIdDescriptor_impl.hpp

@@ -10 +10 @@
   virtual ~AtomIdDescriptor_impl();
 
-  bool predicate(std::pair<int,atom*> atom);
+  bool predicate(std::pair<atomId_t,atom*> atom);
 
 protected:

molecuilder/src/Descriptors/AtomTypeDescriptor.cpp

@@ -20 +20 @@
 {}
 
-bool AtomTypeDescriptor_impl::predicate(std::pair<int,atom*> atom) {
+bool AtomTypeDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom) {
   return (atom.second->getType()==type);
 }

molecuilder/src/Descriptors/AtomTypeDescriptor_impl.hpp

@@ -17 +17 @@
   virtual ~AtomTypeDescriptor_impl();
 
-  bool predicate(std::pair<int,atom*> atom);
+  bool predicate(std::pair<atomId_t,atom*> atom);
 private:
   element *type;