From a9ac0ac725c1973eab878acfd8ae809f4cde6dcb Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 18 Sep 2013 17:49:49 +0200 Subject: [PATCH] Mockups for data facades --- DataStructures/NodeInformationHelpDesk.h | 2 ++ Library/OSRM.cpp | 1 + Server/DataStructures/InternalDataFacade.h | 4 ---- Server/DataStructures/SharedDataFacade.h | 4 ---- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/DataStructures/NodeInformationHelpDesk.h b/DataStructures/NodeInformationHelpDesk.h index 0c8537a80..bee974874 100644 --- a/DataStructures/NodeInformationHelpDesk.h +++ b/DataStructures/NodeInformationHelpDesk.h @@ -26,6 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +//TODO: Umbauen in Private Data Facade + //TODO: Umbauen in Private Data Facade #ifndef NODEINFORMATIONHELPDESK_H_ diff --git a/Library/OSRM.cpp b/Library/OSRM.cpp index d75d5bf40..9f9fcd7ae 100644 --- a/Library/OSRM.cpp +++ b/Library/OSRM.cpp @@ -111,6 +111,7 @@ OSRM::OSRM(const char * server_ini_path, const bool use_shared_memory) //TODO: fetch pointers from shared memory //TODO: objects = new QueryObjectsStorage() + query_data_facade = new SharedDataFacade(); //TODO: generate shared memory plugins RegisterPlugin(new HelloWorldPlugin()); diff --git a/Server/DataStructures/InternalDataFacade.h b/Server/DataStructures/InternalDataFacade.h index fd006bc5b..80c4d6ffb 100644 --- a/Server/DataStructures/InternalDataFacade.h +++ b/Server/DataStructures/InternalDataFacade.h @@ -21,12 +21,8 @@ or see http://www.gnu.org/licenses/agpl.txt. #ifndef INTERNAL_DATA_FACADE #define INTERNAL_DATA_FACADE -//implements all data storage when shared memory is _NOT_ used - #include "BaseDataFacade.h" -#include "../../DataStructures/StaticGraph.h" - template class InternalDataFacade : public BaseDataFacade { diff --git a/Server/DataStructures/SharedDataFacade.h b/Server/DataStructures/SharedDataFacade.h index 4a23919b6..4f3bc8880 100644 --- a/Server/DataStructures/SharedDataFacade.h +++ b/Server/DataStructures/SharedDataFacade.h @@ -21,12 +21,8 @@ or see http://www.gnu.org/licenses/agpl.txt. #ifndef INTERNAL_DATA_FACADE #define INTERNAL_DATA_FACADE -//implements all data storage when shared memory is _NOT_ used - #include "BaseDataFacade.h" -#include "../../DataStructures/StaticGraph.h" - template class SharedDataFacade : public BaseDataFacade {