pkubat / rpms / pgRouting

Forked from rpms/pgRouting 5 years ago
Clone
Blob Blame History Raw
diff -Nur pgrouting-1.05/core/src/astar_boost_wrapper.cpp pgrouting-1.05-libboost/core/src/astar_boost_wrapper.cpp
--- pgrouting-1.05/core/src/astar_boost_wrapper.cpp	2010-11-17 03:42:21.000000000 +0100
+++ pgrouting-1.05-libboost/core/src/astar_boost_wrapper.cpp	2013-03-31 18:51:59.778990343 +0200
@@ -139,8 +139,8 @@
 
   graph_t graph(num_nodes);
 
-  property_map<graph_t, edge_weight_t>::type weightmap = get(edge_weight, 
-							     graph);
+//property_map<graph_t, edge_weight_t>::type weightmap = get(edge_weight, 
+//							     graph);
 
   for (std::size_t j = 0; j < count; ++j)
   {
diff -Nur pgrouting-1.05/core/src/boost_wrapper.cpp pgrouting-1.05-libboost/core/src/boost_wrapper.cpp
--- pgrouting-1.05/core/src/boost_wrapper.cpp	2010-11-17 03:42:21.000000000 +0100
+++ pgrouting-1.05-libboost/core/src/boost_wrapper.cpp	2013-03-31 18:51:59.779990294 +0200
@@ -73,7 +73,7 @@
 
     graph_t graph(num_nodes);
 
-    property_map<graph_t, edge_weight_t>::type weightmap = get(edge_weight, graph);
+    //property_map<graph_t, edge_weight_t>::type weightmap = get(edge_weight, graph);
 
     for (std::size_t j = 0; j < count; ++j)
     {
diff -Nur pgrouting-1.05/core/src/edge_visitors.hpp pgrouting-1.05-libboost/core/src/edge_visitors.hpp
--- pgrouting-1.05/core/src/edge_visitors.hpp	2010-11-17 03:42:21.000000000 +0100
+++ pgrouting-1.05-libboost/core/src/edge_visitors.hpp	2013-03-31 18:51:59.780990245 +0200
@@ -3,10 +3,15 @@
 
 #include <iosfwd>
 #include <boost/config.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/limits.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION <= 14700
 #include <boost/graph/detail/is_same.hpp>
+#else
+#include <boost/type_traits/is_same.hpp>
+#endif
 
 namespace boost 
 {
diff -Nur pgrouting-1.05/core/src/edge_visitors.hpp.orig pgrouting-1.05-libboost/core/src/edge_visitors.hpp.orig
--- pgrouting-1.05/core/src/edge_visitors.hpp.orig	1970-01-01 01:00:00.000000000 +0100
+++ pgrouting-1.05-libboost/core/src/edge_visitors.hpp.orig	2010-11-17 03:42:21.000000000 +0100
@@ -0,0 +1,32 @@
+#ifndef EDGE_VISITORS_HPP
+#define EDGE_VISITORS_HPP
+
+#include <iosfwd>
+#include <boost/config.hpp>
+#include <boost/property_map.hpp>
+#include <boost/graph/graph_traits.hpp>
+#include <boost/limits.hpp>
+#include <boost/graph/detail/is_same.hpp>
+
+namespace boost 
+{
+  // Event Tags
+
+  namespace detail 
+  {
+    // For partial specialization workaround
+    enum event_edge_visitor_enum
+    { 
+      on_initialize_edge_num, on_start_edge_num,
+      on_discover_edge_num, on_finish_edge_num
+    };
+  }
+							    
+  struct on_initialize_edge { enum { num = detail::on_initialize_edge_num }; };
+  struct on_start_edge { enum { num = detail::on_start_edge_num }; };
+  struct on_discover_edge { enum { num = detail::on_discover_edge_num }; };
+  struct on_finish_edge { enum { num = detail::on_finish_edge_num }; };
+
+}
+
+#endif
diff -Nur pgrouting-1.05/core/src/shooting_star_boost_wrapper.cpp pgrouting-1.05-libboost/core/src/shooting_star_boost_wrapper.cpp
--- pgrouting-1.05/core/src/shooting_star_boost_wrapper.cpp	2010-11-17 03:42:21.000000000 +0100
+++ pgrouting-1.05-libboost/core/src/shooting_star_boost_wrapper.cpp	2013-03-31 18:51:59.792989661 +0200
@@ -23,7 +23,7 @@
 
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
-#include <boost/vector_property_map.hpp>
+#include <boost/property_map/vector_property_map.hpp>
 #include <shooting_star_search.hpp>
 
 #include "shooting_star.h"
diff -Nur pgrouting-1.05/core/src/shooting_star_relax.hpp pgrouting-1.05-libboost/core/src/shooting_star_relax.hpp
--- pgrouting-1.05/core/src/shooting_star_relax.hpp	2010-11-17 03:42:21.000000000 +0100
+++ pgrouting-1.05-libboost/core/src/shooting_star_relax.hpp	2013-03-31 18:51:59.793989612 +0200
@@ -15,7 +15,7 @@
 #include <functional>
 #include <boost/limits.hpp> // for numeric limits
 #include <boost/graph/graph_traits.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
 
 #include <postgres.h>
 
diff -Nur pgrouting-1.05/extra/driving_distance/src/boost_drivedist.cpp pgrouting-1.05-libboost/extra/driving_distance/src/boost_drivedist.cpp
--- pgrouting-1.05/extra/driving_distance/src/boost_drivedist.cpp	2010-11-17 03:42:21.000000000 +0100
+++ pgrouting-1.05-libboost/extra/driving_distance/src/boost_drivedist.cpp	2013-03-31 18:51:59.780990245 +0200
@@ -84,8 +84,8 @@
   
   graph_t graph( num_nodes );
   
-  property_map<graph_t, edge_weight_t>::type weightmap = 
-    get(edge_weight, graph);
+  //property_map<graph_t, edge_weight_t>::type weightmap = 
+  //  get(edge_weight, graph);
   
   for (std::size_t j = 0; j < count; ++j)
     {