From 3347c12b3e6b95dc5e86f72de1149cb79a632823 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Thu, 12 Mar 2015 17:39:22 +0300
Subject: [PATCH] Move BORDERS_ constants to hpp

---
 generator/borders_loader.cpp                | 2 --
 generator/borders_loader.hpp                | 3 +++
 generator/generator_tool/generator_tool.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/generator/borders_loader.cpp b/generator/borders_loader.cpp
index eb9a86f31c..0960c058e9 100644
--- a/generator/borders_loader.cpp
+++ b/generator/borders_loader.cpp
@@ -23,8 +23,6 @@
 #include "../std/bind.hpp"
 
 
-#define BORDERS_DIR "borders/"
-#define BORDERS_EXTENSION ".borders"
 #define POLYGONS_FILE "polygons.lst"
 
 
diff --git a/generator/borders_loader.hpp b/generator/borders_loader.hpp
index 4475f01937..6b55671b80 100644
--- a/generator/borders_loader.hpp
+++ b/generator/borders_loader.hpp
@@ -5,6 +5,9 @@
 
 #include "../std/string.hpp"
 
+#define BORDERS_DIR "borders/"
+#define BORDERS_EXTENSION ".borders"
+
 namespace borders
 {
   typedef m2::RegionD Region;
diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index 820023f7e3..18f1bd264d 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -223,7 +223,7 @@ int main(int argc, char ** argv)
     {
       osm::GenerateBordersFromOsm(FLAGS_generate_borders,
                                   path + FLAGS_output + ".osm",
-                                  path + FLAGS_output + ".borders");
+                                  path + FLAGS_output + BORDERS_EXTENSION);
     }
     else
     {