diff --git a/std/algorithm.hpp b/std/algorithm.hpp deleted file mode 100644 index 8ad592f5d8..0000000000 --- a/std/algorithm.hpp +++ /dev/null @@ -1,102 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include - -using std::all_of; -using std::any_of; -using std::binary_search; -using std::copy; -using std::equal; -using std::equal_range; -using std::fill; -using std::find; -using std::find_first_of; -using std::find_if; -using std::for_each; -using std::is_sorted; -using std::iter_swap; -using std::lexicographical_compare; -using std::lower_bound; -using std::max; -using std::max_element; -using std::min; -using std::min_element; -using std::minmax_element; -using std::next_permutation; -using std::none_of; -using std::nth_element; -using std::partial_sort; -using std::remove_if; -using std::replace; -using std::reverse; -using std::set_intersection; -using std::set_union; -using std::sort; -using std::stable_partition; -using std::stable_sort; -using std::swap; -using std::unique; -using std::upper_bound; -// Bug workaround, see http://connect.microsoft.com/VisualStudio/feedbackdetail/view/840578/algorithm-possible-c-compiler-bug-when-using-std-set-difference-with-custom-comperator -#ifdef _MSC_VER -namespace vs_bug -{ -template -OutputIt set_difference( InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2, OutputIt d_first, Compare comp) -{ - while (first1 != last1) - { - if (first2 == last2) - return std::copy(first1, last1, d_first); - if (comp(*first1, *first2)) - *d_first++ = *first1++; - else - { - if (!comp(*first2, *first1)) - ++first1; - ++first2; - } - } - return d_first; -} - -template -OutputIt set_difference(InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2, OutputIt d_first) -{ - while (first1 != last1) - { - if (first2 == last2) - return std::copy(first1, last1, d_first); - - if (*first1 < *first2) - *d_first++ = *first1++; - else - { - if (! (*first2 < *first1)) - ++first1; - ++first2; - } - } - return d_first; -} - -} // namespace vc_bug -#else -using std::set_difference; -#endif -using std::distance; -using std::generate; -using std::pop_heap; -using std::push_heap; -using std::remove_copy_if; -using std::set_symmetric_difference; -using std::sort_heap; -using std::transform; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/bind.hpp b/std/bind.hpp deleted file mode 100644 index 5ce3fd9452..0000000000 --- a/std/bind.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include -using std::bind; -using std::ref; -using std::cref; -using std::placeholders::_1; -using std::placeholders::_2; -using std::placeholders::_3; -using std::placeholders::_4; -using std::placeholders::_5; -using std::placeholders::_6; -using std::placeholders::_7; -using std::placeholders::_8; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/cstdint.hpp b/std/cstdint.hpp deleted file mode 100644 index 7ddc522906..0000000000 --- a/std/cstdint.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include - -using std::int8_t; -using std::uint8_t; -using std::int16_t; -using std::uint16_t; -using std::int32_t; -using std::uint32_t; -using std::int64_t; -using std::uint64_t; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/cstring.hpp b/std/cstring.hpp deleted file mode 100644 index bea08b1996..0000000000 --- a/std/cstring.hpp +++ /dev/null @@ -1,17 +0,0 @@ -// Use this header for the functions: -// - strlen, strcpy, strcmp -// - memcpy, memcmp, memset - -#pragma once - -#ifdef new -#undef new -#endif - -#include - -// Use string.h header if cstring is absent for target platform. - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/function.hpp b/std/function.hpp deleted file mode 100644 index b2965b8970..0000000000 --- a/std/function.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include -using std::function; -using std::greater; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/iostream.hpp b/std/iostream.hpp deleted file mode 100644 index 65ae380120..0000000000 --- a/std/iostream.hpp +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include - -using std::cin; -using std::cout; -using std::cerr; - -using std::istream; -using std::ostream; - -using std::ios_base; - -using std::endl; -using std::flush; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/iterator_facade.hpp b/std/iterator_facade.hpp deleted file mode 100644 index 5bbd3957d9..0000000000 --- a/std/iterator_facade.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include -using boost::iterator_facade; -using boost::random_access_traversal_tag; -using boost::forward_traversal_tag; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/limits.hpp b/std/limits.hpp deleted file mode 100644 index 9af479ecdc..0000000000 --- a/std/limits.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include -#include -using std::numeric_limits; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/list.hpp b/std/list.hpp deleted file mode 100644 index 0d87f33fb2..0000000000 --- a/std/list.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include -using std::list; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/mutex.hpp b/std/mutex.hpp deleted file mode 100644 index ad184fe6cd..0000000000 --- a/std/mutex.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include - -using std::lock_guard; -using std::mutex; -using std::timed_mutex; -using std::unique_lock; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/regex.hpp b/std/regex.hpp deleted file mode 100644 index 2f69582440..0000000000 --- a/std/regex.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#if defined(new) -#undef new -#endif - -#include - -using std::regex; -using std::regex_match; -using std::regex_search; -using std::sregex_token_iterator; -using std::regex_replace; - -#if defined(DEBUG_NEW) -#define new DEBUG_NEW -#endif diff --git a/std/set.hpp b/std/set.hpp deleted file mode 100644 index 36c48b0beb..0000000000 --- a/std/set.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include -using std::multiset; -using std::set; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/shared_ptr.hpp b/std/shared_ptr.hpp deleted file mode 100644 index 2ac9c7ad0a..0000000000 --- a/std/shared_ptr.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include -using std::shared_ptr; -using std::make_shared; -using std::enable_shared_from_this; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/sstream.hpp b/std/sstream.hpp deleted file mode 100644 index dce71cfa8a..0000000000 --- a/std/sstream.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include - -using std::istringstream; -using std::ostringstream; -using std::stringstream; -using std::endl; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/string.hpp b/std/string.hpp deleted file mode 100644 index 0b81875559..0000000000 --- a/std/string.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include - -using std::basic_string; -using std::getline; -using std::stoi; -using std::stod; -using std::string; -using std::to_string; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/transform_iterator.hpp b/std/transform_iterator.hpp deleted file mode 100644 index 1ee0560376..0000000000 --- a/std/transform_iterator.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include -using boost::make_transform_iterator; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/unique_ptr.hpp b/std/unique_ptr.hpp deleted file mode 100644 index a8f198b8fd..0000000000 --- a/std/unique_ptr.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include -using std::unique_ptr; -using std::make_unique; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/unordered_map.hpp b/std/unordered_map.hpp deleted file mode 100644 index 886da44f68..0000000000 --- a/std/unordered_map.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include -using std::unordered_map; -using std::unordered_multimap; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/utility.hpp b/std/utility.hpp deleted file mode 100644 index d2c4a9d159..0000000000 --- a/std/utility.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include - -using std::forward; -using std::make_pair; -using std::move; -using std::pair; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/std/vector.hpp b/std/vector.hpp deleted file mode 100644 index 06b0d1c3e6..0000000000 --- a/std/vector.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#ifdef new -#undef new -#endif - -#include -using std::vector; - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index e746a80a4c..06b7e1f1c7 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -13,60 +13,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -