renamed: Descriptors/* -> descriptors/*
This commit is contained in:
		
							parent
							
								
									58de37e822
								
							
						
					
					
						commit
						1d8c43b445
					
				| @ -65,7 +65,7 @@ set(PrepareSources prepare.cpp ${PrepareGlob}) | |||||||
| add_executable(osrm-prepare ${PrepareSources} $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER>) | add_executable(osrm-prepare ${PrepareSources} $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER>) | ||||||
| 
 | 
 | ||||||
| file(GLOB ServerGlob Server/*.cpp) | file(GLOB ServerGlob Server/*.cpp) | ||||||
| file(GLOB DescriptorGlob Descriptors/*.cpp) | file(GLOB DescriptorGlob descriptors/*.cpp) | ||||||
| file(GLOB DatastructureGlob data_structures/search_engine_data.cpp data_structures/route_parameters.cpp Util/bearing.cpp) | file(GLOB DatastructureGlob data_structures/search_engine_data.cpp data_structures/route_parameters.cpp Util/bearing.cpp) | ||||||
| list(REMOVE_ITEM DatastructureGlob data_structures/Coordinate.cpp) | list(REMOVE_ITEM DatastructureGlob data_structures/Coordinate.cpp) | ||||||
| file(GLOB CoordinateGlob data_structures/Coordinate.cpp) | file(GLOB CoordinateGlob data_structures/Coordinate.cpp) | ||||||
|  | |||||||
| @ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||||
| #include "../data_structures/json_container.hpp" | #include "../data_structures/json_container.hpp" | ||||||
| #include "../data_structures/query_edge.hpp" | #include "../data_structures/query_edge.hpp" | ||||||
| #include "../data_structures/search_engine.hpp" | #include "../data_structures/search_engine.hpp" | ||||||
| #include "../Descriptors/BaseDescriptor.h" | #include "../descriptors/descriptor_base.hpp" | ||||||
| #include "../Util/json_renderer.hpp" | #include "../Util/json_renderer.hpp" | ||||||
| #include "../Util/make_unique.hpp" | #include "../Util/make_unique.hpp" | ||||||
| #include "../Util/StringUtil.h" | #include "../Util/StringUtil.h" | ||||||
|  | |||||||
| @ -32,9 +32,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||||
| 
 | 
 | ||||||
| #include "../algorithms/object_encoder.hpp" | #include "../algorithms/object_encoder.hpp" | ||||||
| #include "../data_structures/search_engine.hpp" | #include "../data_structures/search_engine.hpp" | ||||||
| #include "../Descriptors/BaseDescriptor.h" | #include "../descriptors/descriptor_base.hpp" | ||||||
| #include "../Descriptors/GPXDescriptor.h" | #include "../descriptors/gpx_descriptor.hpp" | ||||||
| #include "../Descriptors/JSONDescriptor.h" | #include "../descriptors/json_descriptor.hpp" | ||||||
| #include "../Util/integer_range.hpp" | #include "../Util/integer_range.hpp" | ||||||
| #include "../Util/json_renderer.hpp" | #include "../Util/json_renderer.hpp" | ||||||
| #include "../Util/make_unique.hpp" | #include "../Util/make_unique.hpp" | ||||||
|  | |||||||
| @ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||||
| 
 | 
 | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| #include "DescriptionFactory.h" | #include "description_factory.hpp" | ||||||
| 
 | 
 | ||||||
| #include <osrm/Coordinate.h> | #include <osrm/Coordinate.h> | ||||||
| 
 | 
 | ||||||
| @ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||||
| 
 | 
 | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| #ifndef DESCRIPTIONFACTORY_H_ | #ifndef DESCRIPTION_FACTORY_HPP | ||||||
| #define DESCRIPTIONFACTORY_H_ | #define DESCRIPTION_FACTORY_HPP | ||||||
| 
 | 
 | ||||||
| #include "../algorithms/douglas_peucker.hpp" | #include "../algorithms/douglas_peucker.hpp" | ||||||
| #include "../data_structures/phantom_node.hpp" | #include "../data_structures/phantom_node.hpp" | ||||||
| @ -223,4 +223,4 @@ class DescriptionFactory | |||||||
|     } |     } | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| #endif /* DESCRIPTIONFACTORY_H_ */ | #endif /* DESCRIPTION_FACTORY_HPP */ | ||||||
| @ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||||
| 
 | 
 | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| #ifndef BASE_DESCRIPTOR_H | #ifndef DESCRIPTOR_BASE_HPP | ||||||
| #define BASE_DESCRIPTOR_H | #define DESCRIPTOR_BASE_HPP | ||||||
| 
 | 
 | ||||||
| #include "../data_structures/phantom_node.hpp" | #include "../data_structures/phantom_node.hpp" | ||||||
| #include "../data_structures/raw_route_data.hpp" | #include "../data_structures/raw_route_data.hpp" | ||||||
| @ -80,4 +80,4 @@ template <class DataFacadeT> class BaseDescriptor | |||||||
|     virtual void SetConfig(const DescriptorConfig &config) = 0; |     virtual void SetConfig(const DescriptorConfig &config) = 0; | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| #endif // BASE_DESCRIPTOR_H
 | #endif // DESCRIPTOR_BASE_HPP
 | ||||||
| @ -25,10 +25,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||||
| 
 | 
 | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| #ifndef GPX_DESCRIPTOR_H | #ifndef GPX_DESCRIPTOR_HPP | ||||||
| #define GPX_DESCRIPTOR_H | #define GPX_DESCRIPTOR_HPP | ||||||
| 
 | 
 | ||||||
| #include "BaseDescriptor.h" | #include "descriptor_base.hpp" | ||||||
| #include "../data_structures/json_container.hpp" | #include "../data_structures/json_container.hpp" | ||||||
| #include "../Util/xml_renderer.hpp" | #include "../Util/xml_renderer.hpp" | ||||||
| 
 | 
 | ||||||
| @ -89,4 +89,4 @@ template <class DataFacadeT> class GPXDescriptor final : public BaseDescriptor<D | |||||||
|         JSON::gpx_render(reply.content, json_result); |         JSON::gpx_render(reply.content, json_result); | ||||||
|     } |     } | ||||||
| }; | }; | ||||||
| #endif // GPX_DESCRIPTOR_H
 | #endif // GPX_DESCRIPTOR_HPP
 | ||||||
| @ -25,11 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||||||
| 
 | 
 | ||||||
| */ | */ | ||||||
| 
 | 
 | ||||||
| #ifndef JSON_DESCRIPTOR_H_ | #ifndef JSON_DESCRIPTOR_HPP | ||||||
| #define JSON_DESCRIPTOR_H_ | #define JSON_DESCRIPTOR_HPP | ||||||
| 
 | 
 | ||||||
| #include "BaseDescriptor.h" | #include "descriptor_base.hpp" | ||||||
| #include "DescriptionFactory.h" | #include "description_factory.hpp" | ||||||
| #include "../algorithms/object_encoder.hpp" | #include "../algorithms/object_encoder.hpp" | ||||||
| #include "../algorithms/route_name_extraction.hpp" | #include "../algorithms/route_name_extraction.hpp" | ||||||
| #include "../data_structures/json_container.hpp" | #include "../data_structures/json_container.hpp" | ||||||
| @ -390,4 +390,4 @@ template <class DataFacadeT> class JSONDescriptor final : public BaseDescriptor< | |||||||
|     } |     } | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| #endif /* JSON_DESCRIPTOR_H_ */ | #endif /* JSON_DESCRIPTOR_HPP */ | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user