Merge branch 'shared_memory' of https://github.com/DennisOSRM/Project-OSRM into shared_memory

This commit is contained in:
Dennis Luxen 2013-09-30 16:12:26 +02:00
commit 74ccb53607
2 changed files with 2 additions and 2 deletions

View File

@ -157,7 +157,7 @@ public:
", code " << e.get_error_code();
throw OSRMException(e.what());
}
};
}
private:
SharedMemoryFactory_tmpl() {}

View File

@ -25,7 +25,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include "DataStructures/StaticRTree.h"
#include "Server/DataStructures/BaseDataFacade.h"
#include "Server/DataStructures/SharedDataType.h"
#include "Util/BoostFilesystemFix.h"
#include "Util/BoostFileSystemFix.h"
#include "Util/IniFile.h"
#include "Util/SimpleLogger.h"
#include "Util/UUID.h"