Refactor name of legacy class _Node into more telling name ExternalMemoryNode

Extractor/ExtractionContainers.cpp

@@ -165,7 +165,7 @@ void ExtractionContainers::PrepareData(const std::string & output_file_name, con
                 continue;
             }
             if(*usedNodeIDsIT == nodesIT->id) {
-                fout.write((char*)&(*nodesIT), sizeof(_Node));
+                fout.write((char*)&(*nodesIT), sizeof(ExternalMemoryNode));
                 ++usedNodeCounter;
                 ++usedNodeIDsIT;
                 ++nodesIT;

Extractor/ExtractionContainers.h

@@ -41,7 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 class ExtractionContainers {
 public:
     typedef stxxl::vector<NodeID>                   STXXLNodeIDVector;
-    typedef stxxl::vector<_Node>                    STXXLNodeVector;
+    typedef stxxl::vector<ExternalMemoryNode>       STXXLNodeVector;
     typedef stxxl::vector<InternalExtractorEdge>    STXXLEdgeVector;
     typedef stxxl::vector<std::string>              STXXLStringVector;
     typedef stxxl::vector<_RawRestrictionContainer> STXXLRestrictionsVector;

Extractor/ExtractorCallbacks.cpp

@@ -36,7 +36,7 @@ ExtractorCallbacks::ExtractorCallbacks(ExtractionContainers * ext, StringMap * s
 ExtractorCallbacks::~ExtractorCallbacks() { }
 
 /** warning: caller needs to take care of synchronization! */
-void ExtractorCallbacks::nodeFunction(const _Node &n) {
+void ExtractorCallbacks::nodeFunction(const ExternalMemoryNode &n) {
     if(n.lat <= 85*COORDINATE_PRECISION && n.lat >= -85*COORDINATE_PRECISION) {
         externalMemory->allNodes.push_back(n);
     }

Extractor/ExtractorCallbacks.h

@@ -55,7 +55,7 @@ public:
     ~ExtractorCallbacks();
 
     /** warning: caller needs to take care of synchronization! */
-    void nodeFunction(const _Node &n);
+    void nodeFunction(const ExternalMemoryNode &n);
 
     bool restrictionFunction(const _RawRestrictionContainer &r);
 

Extractor/ExtractorStructs.h

@@ -172,16 +172,19 @@ struct Cmp : public std::binary_function<NodeID, NodeID, bool> {
     }
 };
 
-struct CmpNodeByID : public std::binary_function<_Node, _Node, bool> {
-    typedef _Node value_type;
-    bool operator ()  (const _Node & a, const _Node & b) const {
+struct CmpNodeByID : public std::binary_function<ExternalMemoryNode, ExternalMemoryNode, bool> {
+    typedef ExternalMemoryNode value_type;
+    bool operator () (
+        const ExternalMemoryNode & a,
+        const ExternalMemoryNode & b
+    ) const {
         return a.id < b.id;
     }
     value_type max_value()  {
-        return _Node::max_value();
+        return ExternalMemoryNode::max_value();
     }
     value_type min_value() {
-        return _Node::min_value();
+        return ExternalMemoryNode::min_value();
     }
 };