From af6bd463306aad0bc7154d5550a298a104bad143 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Thu, 18 Dec 2014 15:44:57 +0300 Subject: [PATCH] Include path fix --- coding/reader.cpp | 2 +- coding/zip_creator.cpp | 24 ++++++++++++------------ coding/zip_creator.hpp | 2 +- generator/polygonizer.hpp | 8 ++++---- indexer/mwm_set.cpp | 2 +- storage/guides.cpp | 12 ++++++------ 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/coding/reader.cpp b/coding/reader.cpp index f2ae3b2f68..42e2d59f08 100644 --- a/coding/reader.cpp +++ b/coding/reader.cpp @@ -1,6 +1,6 @@ #include "reader.hpp" -#include "../../base/string_utils.hpp" +#include "../base/string_utils.hpp" void Reader::ReadAsString(string & s) const diff --git a/coding/zip_creator.cpp b/coding/zip_creator.cpp index 15d8a9dec5..3fc72f932d 100644 --- a/coding/zip_creator.cpp +++ b/coding/zip_creator.cpp @@ -1,21 +1,21 @@ #include "zip_creator.hpp" -#include "../../base/string_utils.hpp" +#include "../base/string_utils.hpp" -#include "../../coding/file_name_utils.hpp" -#include "../../coding/internal/file_data.hpp" -#include "../../coding/reader.hpp" -#include "../../coding/constants.hpp" +#include "../coding/file_name_utils.hpp" +#include "../coding/internal/file_data.hpp" +#include "../coding/reader.hpp" +#include "../coding/constants.hpp" -#include "../../base/logging.hpp" -#include "../../base/scope_guard.hpp" +#include "../base/logging.hpp" +#include "../base/scope_guard.hpp" -#include "../../std/vector.hpp" -#include "../../std/ctime.hpp" -#include "../../std/algorithm.hpp" -#include "../../std/unique_ptr.hpp" +#include "../std/vector.hpp" +#include "../std/ctime.hpp" +#include "../std/algorithm.hpp" +#include "../std/unique_ptr.hpp" -#include "../../3party/zlib/contrib/minizip/zip.h" +#include "../3party/zlib/contrib/minizip/zip.h" namespace diff --git a/coding/zip_creator.hpp b/coding/zip_creator.hpp index 54255cc31e..b9af0273d9 100644 --- a/coding/zip_creator.hpp +++ b/coding/zip_creator.hpp @@ -1,4 +1,4 @@ -#include "../../std/string.hpp" +#include "../std/string.hpp" bool CreateZipFromPathDeflatedAndDefaultCompression(string const & filePath, string const & zipFilePath); diff --git a/generator/polygonizer.hpp b/generator/polygonizer.hpp index c214121758..83b1d0401f 100644 --- a/generator/polygonizer.hpp +++ b/generator/polygonizer.hpp @@ -22,10 +22,10 @@ #endif #if PARALLEL_POLYGONIZER -#include -#include -#include -#include +#include +#include +#include +#include #endif diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp index 3e30e14a24..f38056f311 100644 --- a/indexer/mwm_set.cpp +++ b/indexer/mwm_set.cpp @@ -1,7 +1,7 @@ #include "mwm_set.hpp" #include "scales.hpp" -#include "../../defines.hpp" +#include "../defines.hpp" #include "../base/logging.hpp" #include "../base/macros.hpp" diff --git a/storage/guides.cpp b/storage/guides.cpp index 7bbcdd3aa7..6ffeaeeaf9 100644 --- a/storage/guides.cpp +++ b/storage/guides.cpp @@ -1,11 +1,11 @@ #include "guides.hpp" -#include "../../coding/file_writer.hpp" -#include "../../coding/file_reader.hpp" -#include "../../coding/internal/file_data.hpp" +#include "../coding/file_writer.hpp" +#include "../coding/file_reader.hpp" +#include "../coding/internal/file_data.hpp" -#include "../../platform/platform.hpp" -#include "../../platform/settings.hpp" +#include "../platform/platform.hpp" +#include "../platform/settings.hpp" #include "../base/logging.hpp" #include "../base/timer.hpp" @@ -14,7 +14,7 @@ #include "../std/iostream.hpp" #include "../std/target_os.hpp" -#include "../../3party/jansson/myjansson.hpp" +#include "../3party/jansson/myjansson.hpp" namespace