Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/std
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2015-06-24 19:31:07 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:52:34 +0300
commit9041b8bb69d2b94956cf847e508b9c1ad8c5f190 (patch)
tree22f0cce3a8bd7ba9669d3dd3916c72593a466f73 /std
parentd7dfd870746a3e89ade642fd7d2605e753bbdafd (diff)
Review fixes.
Diffstat (limited to 'std')
-rw-r--r--std/cstdint.hpp4
-rw-r--r--std/kdtree.hpp11
-rw-r--r--std/tuple.hpp37
-rw-r--r--std/utility.hpp1
4 files changed, 4 insertions, 49 deletions
diff --git a/std/cstdint.hpp b/std/cstdint.hpp
index 0e37c1b477..724ef01c02 100644
--- a/std/cstdint.hpp
+++ b/std/cstdint.hpp
@@ -5,6 +5,8 @@
#endif
#include <cstdint>
+#include <cstddef>
+
using std::int8_t;
using std::uint8_t;
using std::int16_t;
@@ -13,8 +15,6 @@ using std::int32_t;
using std::uint32_t;
using std::int64_t;
using std::uint64_t;
-
-#include <cstddef>
using std::size_t;
#ifdef DEBUG_NEW
diff --git a/std/kdtree.hpp b/std/kdtree.hpp
deleted file mode 100644
index bf49e02d73..0000000000
--- a/std/kdtree.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#ifdef new
-#undef new
-#endif
-
-#include "../3party/kdtree++/kdtree.hpp"
-
-#ifdef DEBUG_NEW
-#define new DEBUG_NEW
-#endif
diff --git a/std/tuple.hpp b/std/tuple.hpp
index 760d20f411..1ab641ca7d 100644
--- a/std/tuple.hpp
+++ b/std/tuple.hpp
@@ -5,46 +5,11 @@
#endif
#include <tuple>
-#include <boost/tuple/tuple_comparison.hpp>
+
using std::tuple;
using std::make_tuple;
//using std::get; // "get" is very common name, use "get" member function
-//template <class Tuple> struct tuple_length
-//{
-// static const int value = boost::tuples::length<Tuple>::value;
-//};
-
-//template <int N, class T> struct tuple_element
-//{
-// typedef typename boost::tuples::element<N, T>::type type;
-//};
-
-//namespace impl
-//{
-// template <int N> struct for_each_tuple_impl
-// {
-// template <class Tuple, class ToDo> void operator() (Tuple & t, ToDo & toDo)
-// {
-// toDo(boost::tuples::get<N>(t), N);
-// for_each_tuple_impl<N-1> c;
-// c(t, toDo);
-// }
-// };
-
-// template <> struct for_each_tuple_impl<-1>
-// {
-// template <class Tuple, class ToDo> void operator() (Tuple &, ToDo &) {}
-// };
-//}
-
-//template <class Tuple, class ToDo>
-//void for_each_tuple(Tuple & t, ToDo & toDo)
-//{
-// impl::for_each_tuple_impl<tuple_length<Tuple>::value-1> c;
-// c(t, toDo);
-//}
-
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
diff --git a/std/utility.hpp b/std/utility.hpp
index 64d61997b1..b535e65831 100644
--- a/std/utility.hpp
+++ b/std/utility.hpp
@@ -8,6 +8,7 @@
using std::pair;
using std::make_pair;
using std::move;
+using std::forward;
#ifdef DEBUG_NEW
#define new DEBUG_NEW