From 896aa893cde971b099be93d9d746900bb772e234 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Tue, 31 Mar 2015 15:49:38 +0300 Subject: [PATCH] Moved boost::make_transform_iterator into std/transform_iterator.hpp. --- base/stl_iterator.hpp | 5 ----- search/house_detector.cpp | 1 + std/transform_iterator.hpp | 13 +++++++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 std/transform_iterator.hpp diff --git a/base/stl_iterator.hpp b/base/stl_iterator.hpp index 846a280bcf..25e91acdd7 100644 --- a/base/stl_iterator.hpp +++ b/base/stl_iterator.hpp @@ -2,11 +2,6 @@ #include "../std/iterator_facade.hpp" -#include - -using boost::make_transform_iterator; - - namespace detail { diff --git a/search/house_detector.cpp b/search/house_detector.cpp index 2da5c91d76..5302ec59ab 100644 --- a/search/house_detector.cpp +++ b/search/house_detector.cpp @@ -15,6 +15,7 @@ #include "../std/set.hpp" #include "../std/bind.hpp" #include "../std/numeric.hpp" +#include "../std/transform_iterator.hpp" #ifdef DEBUG #include "../platform/platform.hpp" diff --git a/std/transform_iterator.hpp b/std/transform_iterator.hpp new file mode 100644 index 0000000000..c36ab52d28 --- /dev/null +++ b/std/transform_iterator.hpp @@ -0,0 +1,13 @@ +#pragma once +#include "common_defines.hpp" + +#ifdef new +#undef new +#endif + +#include +using boost::make_transform_iterator; + +#ifdef DEBUG_NEW +#define new DEBUG_NEW +#endif