diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-11-19 22:00:44 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-11-19 22:00:44 +0000 |
commit | c9f8f4b0fbe1e603015e324c980ad81213b428e2 (patch) | |
tree | bc551962fcff0ecd12d476b6102b9184141eb0c6 /src/Simplex_tree | |
parent | ff9818929e33aaf95c407ae6b7539051ca55ad88 (diff) | |
parent | 2ead33fd01bbe97e3b88070d169647c68c3db359 (diff) |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alpha_complex_3d_module_vincent@4003 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 94bbb0a5588ceee1ecf73d0503892e2f6c78274f
Diffstat (limited to 'src/Simplex_tree')
-rw-r--r-- | src/Simplex_tree/include/gudhi/Simplex_tree.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h index 13d7372c..78697ea2 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h @@ -323,8 +323,7 @@ class Simplex_tree { } /** \brief User-defined copy assignment reproduces the whole tree structure. */ - Simplex_tree& operator= (const Simplex_tree& complex_source) - { + Simplex_tree& operator= (const Simplex_tree& complex_source) { #ifdef DEBUG_TRACES std::cout << "Simplex_tree copy assignment" << std::endl; #endif // DEBUG_TRACES @@ -341,8 +340,7 @@ class Simplex_tree { /** \brief User-defined move assignment relocates the whole tree structure. * \exception std::invalid_argument In debug mode, if the complex_source is invalid. */ - Simplex_tree& operator=(Simplex_tree&& complex_source) - { + Simplex_tree& operator=(Simplex_tree&& complex_source) { #ifdef DEBUG_TRACES std::cout << "Simplex_tree move assignment" << std::endl; #endif // DEBUG_TRACES |