fix inconsistencies with integer and iterator range header files, closes

#1296
Project-OSRM · Nov 27, 2014 · ef8706b · ef8706b
1 parent acd1919
commit ef8706b
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 16 deletions.
diff --git a/Algorithms/douglas_peucker.cpp b/Algorithms/douglas_peucker.cpp
@@ -27,8 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "douglas_peucker.hpp"
 
-#include "../DataStructures/Range.h"
 #include "../DataStructures/SegmentInformation.h"
+#include "../Util/integer_range.hpp"
 
 #include <osrm/Coordinate.h>
 

diff --git a/Algorithms/tiny_components.hpp b/Algorithms/tiny_components.hpp
@@ -34,10 +34,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../DataStructures/ImportEdge.h"
 #include "../DataStructures/QueryNode.h"
 #include "../DataStructures/Percent.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/Restriction.h"
 #include "../DataStructures/TurnInstructions.h"
 
+#include "../Util/integer_range.hpp"
 #include "../Util/OSRMException.h"
 #include "../Util/simple_logger.hpp"
 #include "../Util/StdHashExtensions.h"

diff --git a/Contractor/Contractor.h b/Contractor/Contractor.h
@@ -33,9 +33,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../DataStructures/DynamicGraph.h"
 #include "../DataStructures/Percent.h"
 #include "../DataStructures/QueryEdge.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/XORFastHash.h"
 #include "../DataStructures/XORFastHashStorage.h"
+#include "../Util/integer_range.hpp"
 #include "../Util/simple_logger.hpp"
 #include "../Util/StringUtil.h"
 #include "../Util/TimingUtil.h"

diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp
@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "EdgeBasedGraphFactory.h"
 #include "../Algorithms/bfs_components.hpp"
 #include "../DataStructures/Percent.h"
-#include "../DataStructures/Range.h"
 #include "../Util/compute_angle.hpp"
+#include "../Util/integer_range.hpp"
 #include "../Util/LuaUtil.h"
 #include "../Util/simple_logger.hpp"
 #include "../Util/TimingUtil.h"

diff --git a/Contractor/Prepare.cpp b/Contractor/Prepare.cpp
@@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "../Algorithms/crc32_processor.hpp"
 #include "../DataStructures/DeallocatingVector.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/StaticRTree.h"
 #include "../DataStructures/RestrictionMap.h"
 
 #include "../Util/GitDescription.h"
+#include "../Util/integer_range.hpp"
 #include "../Util/LuaUtil.h"
 #include "../Util/make_unique.hpp"
 #include "../Util/OSRMException.h"

diff --git a/DataStructures/DeallocatingVector.h b/DataStructures/DeallocatingVector.h
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DEALLOCATINGVECTOR_H_
 #define DEALLOCATINGVECTOR_H_
 
-#include "Range.h"
+#include "../Util/integer_range.hpp"
 
 #include <boost/iterator/iterator_facade.hpp>
 

diff --git a/DataStructures/DynamicGraph.h b/DataStructures/DynamicGraph.h
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define DYNAMICGRAPH_H
 
 #include "DeallocatingVector.h"
-#include "Range.h"
+#include "../Util/integer_range.hpp"
 
 #include <boost/assert.hpp>
 

diff --git a/DataStructures/RangeTable.h b/DataStructures/RangeTable.h
@@ -1,7 +1,7 @@
 #ifndef RANGE_TABLE_H_
 #define RANGE_TABLE_H_
 
-#include "Range.h"
+#include "../Util/integer_range.hpp"
 #include "SharedMemoryFactory.h"
 #include "SharedMemoryVectorWrapper.h"
 

diff --git a/DataStructures/StaticGraph.h b/DataStructures/StaticGraph.h
@@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define STATIC_GRAPH_H
 
 #include "Percent.h"
-#include "Range.h"
 #include "SharedMemoryVectorWrapper.h"
+#include "../Util/integer_range.hpp"
 #include "../typedefs.h"
 
 #include <boost/assert.hpp>

diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h
@@ -33,10 +33,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Algorithms/object_encoder.hpp"
 #include "../Algorithms/route_name_extraction.hpp"
 #include "../DataStructures/JSONContainer.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/SegmentInformation.h"
 #include "../DataStructures/TurnInstructions.h"
 #include "../Util/bearing.hpp"
+#include "../Util/integer_range.hpp"
 #include "../Util/json_renderer.hpp"
 #include "../Util/simple_logger.hpp"
 #include "../Util/StringUtil.h"

diff --git a/Plugins/NearestPlugin.h b/Plugins/NearestPlugin.h
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BasePlugin.h"
 #include "../DataStructures/JSONContainer.h"
 #include "../DataStructures/phantom_node.hpp"
-#include "../DataStructures/Range.h"
+#include "../Util/integer_range.hpp"
 #include "../Util/json_renderer.hpp"
 
 #include <string>

diff --git a/Plugins/ViaRoutePlugin.h b/Plugins/ViaRoutePlugin.h
@@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BasePlugin.h"
 
 #include "../Algorithms/object_encoder.hpp"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/SearchEngine.h"
 #include "../Descriptors/BaseDescriptor.h"
 #include "../Descriptors/GPXDescriptor.h"
 #include "../Descriptors/JSONDescriptor.h"
+#include "../Util/integer_range.hpp"
 #include "../Util/json_renderer.hpp"
 #include "../Util/make_unique.hpp"
 #include "../Util/simple_logger.hpp"

diff --git a/RoutingAlgorithms/AlternativePathRouting.h b/RoutingAlgorithms/AlternativePathRouting.h
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define ALTERNATIVE_PATH_ROUTING_H
 
 #include "BasicRoutingInterface.h"
-#include "../DataStructures/Range.h"
+#include "../Util/integer_range.hpp"
 #include "../DataStructures/SearchEngineData.h"
 #include "../Util/container.hpp"
 

diff --git a/RoutingAlgorithms/ShortestPathRouting.h b/RoutingAlgorithms/ShortestPathRouting.h
@@ -31,8 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/assert.hpp>
 
 #include "BasicRoutingInterface.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/SearchEngineData.h"
+#include "../Util/integer_range.hpp"
 #include "../typedefs.h"
 
 template <class DataFacadeT> class ShortestPathRouting final : public BasicRoutingInterface<DataFacadeT>

diff --git a/Server/DataStructures/BaseDataFacade.h b/Server/DataStructures/BaseDataFacade.h
@@ -33,8 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../../DataStructures/EdgeBasedNode.h"
 #include "../../DataStructures/ExternalMemoryNode.h"
 #include "../../DataStructures/phantom_node.hpp"
-#include "../../DataStructures/Range.h"
 #include "../../DataStructures/TurnInstructions.h"
+#include "../../Util/integer_range.hpp"
 #include "../../Util/OSRMException.h"
 #include "../../Util/StringUtil.h"
 #include "../../typedefs.h"

diff --git a/Tools/check-hsgr.cpp b/Tools/check-hsgr.cpp
@@ -26,8 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "../DataStructures/Percent.h"
 #include "../DataStructures/QueryEdge.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/StaticGraph.h"
+#include "../Util/integer_range.hpp"
 #include "../Util/GraphLoader.h"
 #include "../Util/simple_logger.hpp"
 #include "../Util/OSRMException.h"

diff --git a/DataStructures/Range.h → Util/integer_range.hpp b/DataStructures/Range.h → Util/integer_range.hpp
diff --git a/Util/range.hpp → Util/iterator_range.hpp b/Util/range.hpp → Util/iterator_range.hpp