Changes in / [958:a5810903ed28:956:4764031c082c] in lemon-1.2

Files:

• lemon/path.h (modified) (8 diffs)
• test/path_test.cc (modified) (1 diff)

lemon/path.h

@@ -65 +65 @@
     Path() {}
 
-    /// \brief Copy constructor
-    ///
-    Path(const Path& cpath) {
-      pathCopy(cpath, *this);
-    }
-
     /// \brief Template copy constructor
     ///
@@ -78 +72 @@
     Path(const CPath& cpath) {
       pathCopy(cpath, *this);
-    }
-
-    /// \brief Copy assignment
-    ///
-    Path& operator=(const Path& cpath) {
-      pathCopy(cpath, *this);
-      return *this;
     }
 
@@ -266 +253 @@
     SimplePath() {}
 
-    /// \brief Copy constructor
-    ///
-    SimplePath(const SimplePath& cpath) {
-      pathCopy(cpath, *this);
-    }
-
     /// \brief Template copy constructor
     ///
@@ -279 +260 @@
     SimplePath(const CPath& cpath) {
       pathCopy(cpath, *this);
-    }
-
-    /// \brief Copy assignment
-    ///
-    SimplePath& operator=(const SimplePath& cpath) {
-      pathCopy(cpath, *this);
-      return *this;
     }
 
@@ -458 +432 @@
     ListPath() : first(0), last(0) {}
 
-    /// \brief Copy constructor
-    ///
-    ListPath(const ListPath& cpath) : first(0), last(0) {
-      pathCopy(cpath, *this);
-    }
-
     /// \brief Template copy constructor
     ///
@@ -478 +446 @@
     ~ListPath() {
       clear();
-    }
-
-    /// \brief Copy assignment
-    ///
-    ListPath& operator=(const ListPath& cpath) {
-      pathCopy(cpath, *this);
-      return *this;
     }
 
@@ -798 +759 @@
     StaticPath() : len(0), arcs(0) {}
 
-    /// \brief Copy constructor
-    ///
-    StaticPath(const StaticPath& cpath) : arcs(0) {
-      pathCopy(cpath, *this);
-    }
-
     /// \brief Template copy constructor
     ///
@@ -817 +772 @@
     ~StaticPath() {
       if (arcs) delete[] arcs;
-    }
-
-    /// \brief Copy assignment
-    ///
-    StaticPath& operator=(const StaticPath& cpath) {
-      pathCopy(cpath, *this);
-      return *this;
     }
 

test/path_test.cc

@@ -39 +39 @@
 }
 
-// Check if proper copy consructor is called (use valgrind for testing)
-template<class _Path>
-void checkCopy()
-{
-  ListDigraph g;
-  ListDigraph::Arc a  = g.addArc(g.addNode(), g.addNode());
-  
-  _Path p,q;
-  p.addBack(a);
-  q=p;
-  _Path r(p);
-  StaticPath<ListDigraph> s(r);
-}
-  
 int main() {
   check_concepts();
-
-  checkCopy<Path<ListDigraph> >();
-  checkCopy<SimplePath<ListDigraph> >();
-  checkCopy<ListPath<ListDigraph> >();
-
-  ListDigraph g;
-  ListDigraph::Arc a  = g.addArc(g.addNode(), g.addNode());
-  
-  Path<ListDigraph> p;
-  StaticPath<ListDigraph> q,r;
-  p.addBack(a);
-  q=p;
-  r=q;
-  StaticPath<ListDigraph> s(q);
-
   return 0;
 }