Fix compilation issues

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

Former-commit-id: 343308ef914e6a6617890f49a55eb0bb8db15ee9

2 files changed, 15 insertions, 7 deletions

diff --git a/src/Simplex_tree/example/simple_simplex_tree.cpp b/src/Simplex_tree/example/simple_simplex_tree.cpp
index 5146b906..bf6dc470 100644
--- a/src/Simplex_tree/example/simple_simplex_tree.cpp
+++ b/src/Simplex_tree/example/simple_simplex_tree.cpp
@@ -27,10 +27,11 @@
 #include <utility>  // for pair
 #include <vector>
 
-using namespace Gudhi;
-
-typedef std::vector< Vertex_handle > typeVectorVertex;
-typedef std::pair< Simplex_tree<>::Simplex_handle, bool > typePairSimplexBool;
+using Simplex_tree = Gudhi::Simplex_tree<>;
+using Vertex_handle = Simplex_tree::Vertex_handle;
+using Filtration_value = Simplex_tree::Filtration_value;
+using typeVectorVertex = std::vector< Vertex_handle >;
+using typePairSimplexBool = std::pair< Simplex_tree::Simplex_handle, bool >;
 
 int main(int argc, char * const argv[]) {
   const Filtration_value FIRST_FILTRATION_VALUE = 0.1;
@@ -42,7 +43,7 @@ int main(int argc, char * const argv[]) {
   std::cout << "********************************************************************" << std::endl;
   std::cout << "EXAMPLE OF SIMPLE INSERTION" << std::endl;
   // Construct the Simplex Tree
-  Simplex_tree<> simplexTree;
+  Simplex_tree simplexTree;
 
   /* Simplex to be inserted:  */
   /*    1                     */
@@ -212,7 +213,7 @@ int main(int argc, char * const argv[]) {
   // ------------------------------------------------------------------------------------------------------------------
   // Find in the simplex_tree
   // ------------------------------------------------------------------------------------------------------------------
-  Simplex_tree<>::Simplex_handle simplexFound = simplexTree.find(secondSimplexVector);
+  Simplex_tree::Simplex_handle simplexFound = simplexTree.find(secondSimplexVector);
   std::cout << "**************IS THE SIMPLEX {1} IN THE SIMPLEX TREE ?\n";
   if (simplexFound != simplexTree.null_simplex())
     std::cout << "***+ YES IT IS!\n";
diff --git a/src/Simplex_tree/example/simplex_tree_from_cliques_of_graph.cpp b/src/Simplex_tree/example/simplex_tree_from_cliques_of_graph.cpp
index 58085014..8d729c56 100644
--- a/src/Simplex_tree/example/simplex_tree_from_cliques_of_graph.cpp
+++ b/src/Simplex_tree/example/simplex_tree_from_cliques_of_graph.cpp
@@ -29,6 +29,13 @@
 
 using namespace Gudhi;
 
+typedef int Vertex_handle;
+typedef double Filtration_value;
+typedef boost::adjacency_list < boost::vecS, boost::vecS, boost::undirectedS,
+                                boost::property < vertex_filtration_t, Filtration_value >,
+                                boost::property < edge_filtration_t, Filtration_value > > Graph_t;
+typedef std::pair< Vertex_handle, Vertex_handle > Edge_t;
+
 int main(int argc, char * const argv[]) {
   if (argc != 3) {
     std::cerr << "Usage: " << argv[0]
@@ -43,7 +50,7 @@ int main(int argc, char * const argv[]) {
   Simplex_tree<> st;
 
   start = clock();
-  auto g = read_graph(filegraph);
+  auto g = read_graph<Graph_t, Edge_t, Filtration_value, Vertex_handle>(filegraph);
   // insert the graph in the simplex tree as 1-skeleton
   st.insert_graph(g);
   end = clock();