Namespace problem -> Persistent_cohomology should not be friend of Simplex_tree

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

Former-commit-id: 94e6de54c7209c091482a7325acbbf24727fdfc2

3 files changed, 9 insertions, 4 deletions

diff --git a/src/Persistent_cohomology/example/rips_persistence.cpp b/src/Persistent_cohomology/example/rips_persistence.cpp
index f7f9527f..e6645806 100644
--- a/src/Persistent_cohomology/example/rips_persistence.cpp
+++ b/src/Persistent_cohomology/example/rips_persistence.cpp
@@ -74,7 +74,7 @@ int main (int argc, char * argv[])
   st.initialize_filtration();
 
 // Compute the persistence diagram of the complex
-  Persistent_cohomology< Simplex_tree<>, Field_Zp > pcoh( st );
+  persistent_cohomology::Persistent_cohomology< Simplex_tree<>, Field_Zp > pcoh(st);
   pcoh.init_coefficients( p ); //initilizes the coefficient field for homology
   
   pcoh.compute_persistent_cohomology( min_persistence );
diff --git a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
index f44045d0..0c1b52c6 100644
--- a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
+++ b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
@@ -41,7 +41,7 @@ std::string test_rips_persistence(int coefficient, int min_persistence) {
   st.initialize_filtration();
 
   // Compute the persistence diagram of the complex
-  Persistent_cohomology<Simplex_tree<>, Field_Zp> pcoh(st);
+  persistent_cohomology::Persistent_cohomology<Simplex_tree<>, Field_Zp> pcoh(st);
 
   pcoh.init_coefficients( coefficient );  // initializes the coefficient field for homology
   // Check infinite rips
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index 2417313e..5da39729 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -37,6 +37,10 @@
 #include <vector>
 
 namespace Gudhi {
+  
+namespace persistent_cohomology{
+  template<class T1, class T2> class Persistent_cohomology;
+  }
 
 /** \defgroup simplex_tree Filtered Complexes
  *
@@ -116,8 +120,9 @@ class Simplex_tree {
   friend class Simplex_tree_complex_simplex_iterator< Simplex_tree<FiltrationValue, SimplexKey, VertexHandle> >;
   friend class Simplex_tree_skeleton_simplex_iterator< Simplex_tree<FiltrationValue, SimplexKey, VertexHandle> >;
 
-  template<class T1, class T2> friend class Persistent_cohomology;
- 
+  
+  template<class T1, class T2> friend class persistent_cohomology::Persistent_cohomology;
+  
 
   /* \brief Set of nodes sharing a same parent in the simplex tree. */
   typedef Simplex_tree_siblings<Simplex_tree, Dictionary> Siblings;