Merge branch 'main' of ssh://github.com/GrossfieldLab/loos

GrossfieldLab · Jan 23, 2024 · ddd5ebc · ddd5ebc
2 parents 6c3326c + 93e476d
commit ddd5ebc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Tools/fcontacts.cpp b/Tools/fcontacts.cpp
@@ -174,7 +174,7 @@ class ToolOptions : public opts::OptionsPackage
 
 // Check for atom equality only through atomid...
 
-struct IdEquals : public binary_function<pAtom, pAtom, bool> 
+struct IdEquals
 {
     bool operator()(const pAtom& a, const pAtom& b) const 
         {

diff --git a/src/Atom.hpp b/src/Atom.hpp
@@ -282,7 +282,7 @@ namespace loos {
 
 #if !defined(SWIG)
   //! Compares two atoms based solely on name, id, resid, resname, and segid
-  struct AtomEquals : public std::binary_function<pAtom, pAtom, bool> {
+  struct AtomEquals {
     bool operator()(const pAtom& a, const pAtom& b) const;
   };
 
@@ -291,7 +291,7 @@ namespace loos {
   /**
    * The default distance threshold is 1e-3 Angstroms
    */
-  struct AtomCoordsEquals : public std::binary_function<pAtom, pAtom, bool> {
+  struct AtomCoordsEquals {
     AtomCoordsEquals(const double d) : threshold(d*d) { }
     AtomCoordsEquals() : threshold(1e-6) { }
 

diff --git a/src/AtomicGroup.hpp b/src/AtomicGroup.hpp
@@ -256,7 +256,7 @@ namespace loos
      *
      * Or as another example, comparing only residue numbers...
      * \code
-     * struct ResidEquals : public std::binary_function<pAtom, pAtom, bool> {
+     * struct ResidEquals {
      *   bool operator()(const pAtom& a, const pAtom& b) { return(a.resid() == b.resid()); }
      * };
      *