Fixing compilation problems on windows.

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

Former-commit-id: 581b7b16e31cf1c0872e8f30629acc180135db77

7 files changed, 12 insertions, 9 deletions

diff --git a/src/Gudhi_stat/include/gudhi/Persistence_intervals.h b/src/Gudhi_stat/include/gudhi/Persistence_intervals.h
index 539d38e5..792c0a28 100644
--- a/src/Gudhi_stat/include/gudhi/Persistence_intervals.h
+++ b/src/Gudhi_stat/include/gudhi/Persistence_intervals.h
@@ -34,6 +34,7 @@
 #include <algorithm>
 #include <limits>
 #include <cmath>
+#include <functional>
 
 namespace Gudhi 
 {
diff --git a/src/Gudhi_stat/include/gudhi/Persistence_landscape_on_grid.h b/src/Gudhi_stat/include/gudhi/Persistence_landscape_on_grid.h
index ed9c14ea..5703163a 100644
--- a/src/Gudhi_stat/include/gudhi/Persistence_landscape_on_grid.h
+++ b/src/Gudhi_stat/include/gudhi/Persistence_landscape_on_grid.h
@@ -35,6 +35,7 @@
 #include <cmath>
 #include <limits>
 #include <functional>
+#include <functional>
 
 
 //gudhi include
diff --git a/src/Gudhi_stat/include/gudhi/Persistence_vectors.h b/src/Gudhi_stat/include/gudhi/Persistence_vectors.h
index d623dd0d..7fde3413 100644
--- a/src/Gudhi_stat/include/gudhi/Persistence_vectors.h
+++ b/src/Gudhi_stat/include/gudhi/Persistence_vectors.h
@@ -29,6 +29,7 @@
 #include <algorithm>
 #include <iostream>
 #include <limits>
+#include <functional>
 
 //gudhi include
 #include <gudhi/read_persistence_from_file.h>
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/CMakeLists.txt b/src/Gudhi_stat/utilities/persistence_heat_maps/CMakeLists.txt
index eaec61a7..764e44dc 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/CMakeLists.txt
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/CMakeLists.txt
@@ -12,17 +12,17 @@ add_executable ( create_pssk create_pssk.cpp )
 target_link_libraries(create_pssk ${Boost_SYSTEM_LIBRARY})
 add_test ( create_pssk ${CMAKE_CURRENT_BINARY_DIR}/create_pssk    10 -1 -1 4 -1   "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" )
 
-add_executable ( create_persistence_heat_maps_weighted_by_distance_from_diagonal create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp  )
-target_link_libraries(create_persistence_heat_maps_weighted_by_distance_from_diagonal ${Boost_SYSTEM_LIBRARY})
-add_test ( create_persistence_heat_maps_weighted_by_distance_from_diagonal ${CMAKE_CURRENT_BINARY_DIR}/create_persistence_heat_maps_weighted_by_distance_from_diagonal 10 -1 -1 4 -1   "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt"  )
+add_executable ( create_p_h_m_weighted_by_distance_from_diagonal create_p_h_m_weighted_by_distance_from_diagonal.cpp  )
+target_link_libraries(create_p_h_m_weighted_by_distance_from_diagonal ${Boost_SYSTEM_LIBRARY})
+add_test ( create_p_h_m_weighted_by_distance_from_diagonal ${CMAKE_CURRENT_BINARY_DIR}/create_p_h_m_weighted_by_distance_from_diagonal 10 -1 -1 4 -1   "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt"  )
 
-add_executable ( create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp )
-target_link_libraries(create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal ${Boost_SYSTEM_LIBRARY})
-add_test ( create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal ${CMAKE_CURRENT_BINARY_DIR}/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal    10 -1 -1 4 -1   "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt"  )
+add_executable ( create_p_h_m_weighted_by_squared_distance_from_diagonal create_p_h_m_weighted_by_squared_distance_from_diagonal.cpp )
+target_link_libraries(create_p_h_m_weighted_by_squared_distance_from_diagonal ${Boost_SYSTEM_LIBRARY})
+add_test ( create_p_h_m_weighted_by_squared_distance_from_diagonal ${CMAKE_CURRENT_BINARY_DIR}/create_p_h_m_weighted_by_squared_distance_from_diagonal    10 -1 -1 4 -1   "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt"  )
 
-add_executable ( create_persistence_heat_maps_weighted_by_arctan_of_their_persistence create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp )
-target_link_libraries(create_persistence_heat_maps_weighted_by_arctan_of_their_persistence ${Boost_SYSTEM_LIBRARY})
-add_test ( create_persistence_heat_maps_weighted_by_arctan_of_their_persistence ${CMAKE_CURRENT_BINARY_DIR}/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence    10 -1 -1 4 -1   "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt"  )
+add_executable ( create_p_h_m_weighted_by_arctan_of_their_persistence create_p_h_m_weighted_by_arctan_of_their_persistence.cpp )
+target_link_libraries(create_p_h_m_weighted_by_arctan_of_their_persistence ${Boost_SYSTEM_LIBRARY})
+add_test ( create_p_h_m_weighted_by_arctan_of_their_persistence ${CMAKE_CURRENT_BINARY_DIR}/create_p_h_m_weighted_by_arctan_of_their_persistence   10 -1 -1 4 -1   "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt"  )
 
 add_executable ( average_persistence_heat_maps average_persistence_heat_maps.cpp )
 target_link_libraries(average_persistence_heat_maps ${Boost_SYSTEM_LIBRARY})
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_p_h_m_weighted_by_arctan_of_their_persistence.cpp
index aa887c9c..aa887c9c 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_p_h_m_weighted_by_arctan_of_their_persistence.cpp
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_p_h_m_weighted_by_distance_from_diagonal.cpp
index aa13d786..aa13d786 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_p_h_m_weighted_by_distance_from_diagonal.cpp
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_p_h_m_weighted_by_squared_distance_from_diagonal.cpp
index 46258329..46258329 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_p_h_m_weighted_by_squared_distance_from_diagonal.cpp