Merge last trunk modifications

Fix doxygen warnings


git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/add_utils_in_gudhi_v2@2888 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: b80b28a10495b6f2519b53885b1bf31be85ed7ac

3 files changed, 1 insertions, 3 deletions

diff --git a/src/Witness_complex/doc/Witness_complex_doc.h b/src/Witness_complex/doc/Witness_complex_doc.h
index 171a185f..20834be0 100644
--- a/src/Witness_complex/doc/Witness_complex_doc.h
+++ b/src/Witness_complex/doc/Witness_complex_doc.h
@@ -107,7 +107,7 @@ int main(int argc, char * const argv[]) {
 
    Here is an example of constructing a strong witness complex filtration and computing persistence on it:
 
-   \include Witness_complex/example_strong_witness_persistence.cpp
+   \include Witness_complex/strong_witness_persistence.cpp
 
    \copyright GNU General Public License v3.
 
diff --git a/src/Witness_complex/include/gudhi/Strong_witness_complex.h b/src/Witness_complex/include/gudhi/Strong_witness_complex.h
index 6f4bcf60..c18335d3 100644
--- a/src/Witness_complex/include/gudhi/Strong_witness_complex.h
+++ b/src/Witness_complex/include/gudhi/Strong_witness_complex.h
@@ -127,7 +127,6 @@ class Strong_witness_complex {
       if ((Landmark_id)simplex.size() - 1 > complex_dim)
         complex_dim = simplex.size() - 1;
     }
-    complex.set_dimension(complex_dim);
     return true;
   }
 
diff --git a/src/Witness_complex/include/gudhi/Witness_complex.h b/src/Witness_complex/include/gudhi/Witness_complex.h
index bcfe8484..53c38520 100644
--- a/src/Witness_complex/include/gudhi/Witness_complex.h
+++ b/src/Witness_complex/include/gudhi/Witness_complex.h
@@ -130,7 +130,6 @@ class Witness_complex {
       }
       k++;
     }
-    complex.set_dimension(k-1);
     return true;
   }