diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 6bf99996f5..db06b247f7 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -29,7 +29,6 @@ set(SRC file_name_utils.hpp geo_object_id.cpp geo_object_id.hpp - get_time.hpp gmtime.cpp gmtime.hpp internal/message.cpp diff --git a/base/get_time.hpp b/base/get_time.hpp deleted file mode 100644 index 0fa0f5a4ef..0000000000 --- a/base/get_time.hpp +++ /dev/null @@ -1,69 +0,0 @@ -#pragma once - -#include "std/target_os.hpp" - -#if defined(OMIM_OS_LINUX) -#include -#endif - -#include - -namespace base -{ -#if defined(OMIM_OS_LINUX) - -namespace detail -{ -template -struct get_time_manip -{ - tm * __tm_; - const _CharT * __fmt_; - - get_time_manip(tm * __tm, const _CharT * __fmt) : __tm_(__tm), __fmt_(__fmt) {} -}; - -template -class stream_buf_impl : public std::basic_streambuf<_CharT, _Traits> -{ - typedef std::basic_streambuf<_CharT, _Traits> base_t; - -public: - bool parse(const get_time_manip<_CharT> & __x) - { - // Workaround works only for a stream buffer under null-terminated string. - assert(*base_t::egptr() == 0); - - char * res = ::strptime(base_t::gptr(), __x.__fmt_, __x.__tm_); - if (res == 0) - return false; - else - { - base_t::setg(base_t::eback(), res, base_t::egptr()); - return true; - } - } -}; - -template -std::basic_istream<_CharT, _Traits> & operator>>(std::basic_istream<_CharT, _Traits> & __is, - const get_time_manip<_CharT> & __x) -{ - if (!reinterpret_cast *>(__is.rdbuf())->parse(__x)) - __is.setstate(std::ios_base::failbit); - return __is; -} -} // namespace detail - -template -detail::get_time_manip<_CharT> get_time(tm * __tm, const _CharT * __fmt) -{ - return detail::get_time_manip<_CharT>(__tm, __fmt); -} - -#else - -using std::get_time; - -#endif -} // namespace base diff --git a/base/timer.cpp b/base/timer.cpp index c4854b156f..6b4a0a3e2a 100644 --- a/base/timer.cpp +++ b/base/timer.cpp @@ -1,7 +1,6 @@ #include "base/timer.hpp" #include "base/assert.hpp" -#include "base/get_time.hpp" #include "base/gmtime.hpp" #include "base/logging.hpp" #include "base/macros.hpp" @@ -13,7 +12,7 @@ #include #include #include -#include +#include // std::get_time #include #include @@ -144,7 +143,7 @@ time_t StringToTimestamp(std::string const & s) // Parse UTC format: 1970-01-01T00:00:00Z tm t{}; std::istringstream ss(s); - ss >> base::get_time(&t, "%Y-%m-%dT%H:%M:%SZ"); + ss >> std::get_time(&t, "%Y-%m-%dT%H:%M:%SZ"); if (!ss.fail() && IsValid(t)) res = base::TimeGM(t); @@ -155,7 +154,7 @@ time_t StringToTimestamp(std::string const & s) tm t1{}, t2{}; char sign; std::istringstream ss(s); - ss >> base::get_time(&t1, "%Y-%m-%dT%H:%M:%S") >> sign >> base::get_time(&t2, "%H:%M"); + ss >> std::get_time(&t1, "%Y-%m-%dT%H:%M:%S") >> sign >> std::get_time(&t2, "%H:%M"); if (!ss.fail() && IsValid(t1)) { diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index 0666e08873..1a110d351e 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 3917FA53211E008C00937DF4 /* clustering_map.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3917FA52211E008C00937DF4 /* clustering_map.hpp */; }; 3917FA57211E009700937DF4 /* geo_object_id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3917FA54211E009700937DF4 /* geo_object_id.cpp */; }; 3917FA58211E009700937DF4 /* geo_object_id.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3917FA55211E009700937DF4 /* geo_object_id.hpp */; }; - 3917FA59211E009700937DF4 /* get_time.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3917FA56211E009700937DF4 /* get_time.hpp */; }; 3917FA5C211E00BB00937DF4 /* pprof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3917FA5A211E00BA00937DF4 /* pprof.cpp */; }; 3917FA5D211E00BB00937DF4 /* pprof.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3917FA5B211E00BB00937DF4 /* pprof.hpp */; }; 3917FA5F211E00C400937DF4 /* suffix_array.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3917FA5E211E00C300937DF4 /* suffix_array.hpp */; }; @@ -175,7 +174,6 @@ 3917FA52211E008C00937DF4 /* clustering_map.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = clustering_map.hpp; sourceTree = ""; }; 3917FA54211E009700937DF4 /* geo_object_id.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geo_object_id.cpp; sourceTree = ""; }; 3917FA55211E009700937DF4 /* geo_object_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geo_object_id.hpp; sourceTree = ""; }; - 3917FA56211E009700937DF4 /* get_time.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = get_time.hpp; sourceTree = ""; }; 3917FA5A211E00BA00937DF4 /* pprof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pprof.cpp; sourceTree = ""; }; 3917FA5B211E00BB00937DF4 /* pprof.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pprof.hpp; sourceTree = ""; }; 3917FA5E211E00C300937DF4 /* suffix_array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = suffix_array.hpp; sourceTree = ""; }; @@ -433,7 +431,6 @@ 390F1C0B2294298E00EA58E3 /* file_name_utils.hpp */, 3917FA54211E009700937DF4 /* geo_object_id.cpp */, 3917FA55211E009700937DF4 /* geo_object_id.hpp */, - 3917FA56211E009700937DF4 /* get_time.hpp */, 671182EE1C807C0A00CB8177 /* gmtime.cpp */, 671182EF1C807C0A00CB8177 /* gmtime.hpp */, 675345381A3F6F5E00A0A8C3 /* internal */, @@ -560,7 +557,6 @@ 3446C6711DDCA96300146687 /* dfa_helpers.hpp in Headers */, 6753420C1A3F57E400A0A8C3 /* threaded_list.hpp in Headers */, 564C197B254AF896007471CE /* optional_lock_guard.hpp in Headers */, - 3917FA59211E009700937DF4 /* get_time.hpp in Headers */, 675341DB1A3F57E400A0A8C3 /* exception.hpp in Headers */, 6753453E1A3F6F6A00A0A8C3 /* message.hpp in Headers */, 39BC0FD01FD057FA00B6C276 /* control_flow.hpp in Headers */,