From 7cf46afc486a75dafacccb5a6c901862cde76796 Mon Sep 17 00:00:00 2001
From: Dennis Luxen <luxen@kit.edu>
Date: Mon, 23 Sep 2013 13:42:35 +0200
Subject: [PATCH] Remove old facade from UUID generation

---
 Util/UUID.cpp.in        | 16 ++++------------
 Util/UUID.h             |  1 -
 cmake/UUID-Config.cmake |  1 -
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Util/UUID.cpp.in b/Util/UUID.cpp.in
index 7030fa6f6..bdd4fb1e1 100644
--- a/Util/UUID.cpp.in
+++ b/Util/UUID.cpp.in
@@ -30,13 +30,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #cmakedefine01 HAS64BITS
 #cmakedefine MD5PREPARE "${MD5PREPARE}"
 #cmakedefine MD5RTREE "${MD5RTREE}"
-#cmakedefine MD5NODEINFO "${MD5NODEINFO}"
 #cmakedefine MD5GRAPH "${MD5GRAPH}"
 #cmakedefine MD5OBJECTS "${MD5OBJECTS}"
 
 UUID::UUID() : magic_number(1297240911) {
-    md5_prepare[32] = md5_tree[32] = md5_nodeinfo[32] = md5_graph[32] =
-        md5_objects[32] = '\0';
+    md5_prepare[32] =
+    md5_tree[32]    =
+    md5_graph[32]   =
+    md5_objects[32] = '\0';
 
  	boost::uuids::name_generator gen(named_uuid);
  	std::string temp_string(__DATE__);
@@ -46,8 +47,6 @@ UUID::UUID() : magic_number(1297240911) {
  	temp_string += md5_prepare;
  	std::copy(MD5RTREE, MD5RTREE+32, md5_tree);
  	temp_string += md5_tree;
- 	std::copy(MD5NODEINFO, MD5NODEINFO+32, md5_nodeinfo);
- 	temp_string += md5_nodeinfo;
  	std::copy(MD5GRAPH, MD5GRAPH+32, md5_graph);
  	temp_string += md5_graph;
  	std::copy(MD5OBJECTS, MD5OBJECTS+32, md5_objects);
@@ -90,13 +89,6 @@ bool UUID::TestRTree(const UUID & other) const {
 	return std::equal(md5_tree, md5_tree+32, other.md5_tree);
 }
 
-bool UUID::TestNodeInfo(const UUID & other) const {
-    if(!other.IsMagicNumberOK()) {
-        throw OSRMException("nodes file misses magic number. Check or reprocess the file");
-    }
-	return std::equal(md5_nodeinfo, md5_nodeinfo+32, other.md5_nodeinfo);
-}
-
 bool UUID::TestQueryObjects(const UUID & other) const {
     if(!other.IsMagicNumberOK()) {
         throw OSRMException("missing magic number. Check or reprocess the file");
diff --git a/Util/UUID.h b/Util/UUID.h
index fe981efdb..3ba84b9b8 100644
--- a/Util/UUID.h
+++ b/Util/UUID.h
@@ -58,7 +58,6 @@ private:
     const unsigned magic_number;
     char md5_prepare[33];
     char md5_tree[33];
-	char md5_nodeinfo[33];
 	char md5_graph[33];
 	char md5_objects[33];
 
diff --git a/cmake/UUID-Config.cmake b/cmake/UUID-Config.cmake
index 14a057d54..5c852052d 100644
--- a/cmake/UUID-Config.cmake
+++ b/cmake/UUID-Config.cmake
@@ -4,7 +4,6 @@ if (EXISTS ${OLDFILE})
 endif()
 file(MD5 ${SOURCE_DIR}/prepare.cpp MD5PREPARE)
 file(MD5 ${SOURCE_DIR}/DataStructures/StaticRTree.h MD5RTREE)
-file(MD5 ${SOURCE_DIR}/DataStructures/NodeInformationHelpDesk.h MD5NODEINFO)
 file(MD5 ${SOURCE_DIR}/Util/GraphLoader.h MD5GRAPH)
 file(MD5 ${SOURCE_DIR}/Server/DataStructures/InternalDataFacade.h MD5OBJECTS)