From 48ecb3a58742404f15d9e78eff75109f388ffd3a Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Fri, 14 Nov 2014 16:34:00 +0300
Subject: [generator] Better process of parent relation tags for generated
 feature.

---
 generator/feature_generator.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'generator/feature_generator.cpp')

diff --git a/generator/feature_generator.cpp b/generator/feature_generator.cpp
index 5d602fa4ec..b75a45164e 100644
--- a/generator/feature_generator.cpp
+++ b/generator/feature_generator.cpp
@@ -41,8 +41,8 @@ class FileHolder : public cache::BaseFileHolder<TNodesHolder, cache::DataFileRea
 
   template <class TElement, class ToDo> struct process_base
   {
-    reader_t & m_reader;
   protected:
+    reader_t & m_reader;
     ToDo & m_toDo;
   public:
     process_base(reader_t & reader, ToDo & toDo) : m_reader(reader), m_toDo(toDo) {}
@@ -73,12 +73,7 @@ class FileHolder : public cache::BaseFileHolder<TNodesHolder, cache::DataFileRea
 
     bool operator() (uint64_t id)
     {
-      switch (this->m_toDo(id))
-      {
-      case 1:   return true;
-      case -1:  return false;
-      default:  return base_type::operator()(id);
-      }
+      return this->m_toDo(id, this->m_reader);
     }
   };
 
-- 
cgit v1.2.3