diff options
author | louiz’ <louiz@louiz.org> | 2016-10-11 21:00:56 +0200 |
---|---|---|
committer | louiz’ <louiz@louiz.org> | 2016-10-11 21:00:56 +0200 |
commit | c54f28d29d5f1d7a2bb973609beffbe5ad56d422 (patch) | |
tree | ae678be64f6bb8559fadadf3caee2be883a8b35f | |
parent | dfc0793ef2fec12d2613b53b27f1a7f85dae2688 (diff) | |
download | biboumi-c54f28d29d5f1d7a2bb973609beffbe5ad56d422.tar.gz biboumi-c54f28d29d5f1d7a2bb973609beffbe5ad56d422.tar.bz2 biboumi-c54f28d29d5f1d7a2bb973609beffbe5ad56d422.tar.xz biboumi-c54f28d29d5f1d7a2bb973609beffbe5ad56d422.zip |
Conditionally use strptime if we don’t have std::get_time
-rw-r--r-- | louloulibs/CMakeLists.txt | 13 | ||||
-rw-r--r-- | louloulibs/louloulibs.h.cmake | 3 | ||||
-rw-r--r-- | louloulibs/utils/time.cpp | 11 |
3 files changed, 26 insertions, 1 deletions
diff --git a/louloulibs/CMakeLists.txt b/louloulibs/CMakeLists.txt index bf53504..1858bb3 100644 --- a/louloulibs/CMakeLists.txt +++ b/louloulibs/CMakeLists.txt @@ -143,4 +143,17 @@ if(SYSTEMD_FOUND) target_link_libraries(xmpplib ${SYSTEMD_LIBRARIES}) endif() +# +## Check if we have std::get_time +# +include(CheckCXXSourceCompiles) + +check_cxx_source_compiles(" + #include <iomanip> + int main() + { std::get_time(nullptr, \"\"); }" + HAS_GET_TIME) + +mark_as_advanced(HAS_GET_TIME) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/louloulibs.h.cmake ${CMAKE_BINARY_DIR}/src/louloulibs.h) diff --git a/louloulibs/louloulibs.h.cmake b/louloulibs/louloulibs.h.cmake index 2feaf4e..d5328b8 100644 --- a/louloulibs/louloulibs.h.cmake +++ b/louloulibs/louloulibs.h.cmake @@ -6,4 +6,5 @@ #cmakedefine BOTAN_FOUND #cmakedefine CARES_FOUND #cmakedefine SOFTWARE_VERSION "${SOFTWARE_VERSION}" -#cmakedefine PROJECT_NAME "${PROJECT_NAME}"
\ No newline at end of file +#cmakedefine PROJECT_NAME "${PROJECT_NAME}" +#cmakedefine HAS_GET_TIME diff --git a/louloulibs/utils/time.cpp b/louloulibs/utils/time.cpp index 7ad6663..afd6117 100644 --- a/louloulibs/utils/time.cpp +++ b/louloulibs/utils/time.cpp @@ -5,6 +5,8 @@ #include <iomanip> #include <locale> +#include "louloulibs.h" + namespace utils { std::string to_string(const std::time_t& timestamp) @@ -20,6 +22,7 @@ std::time_t parse_datetime(const std::string& stamp) { static const char* format = "%Y-%m-%dT%H:%M:%S"; std::tm t = {}; +#ifdef HAS_GET_TIME std::istringstream ss(stamp); ss.imbue(std::locale("en_US.utf-8")); @@ -27,6 +30,14 @@ std::time_t parse_datetime(const std::string& stamp) ss >> std::get_time(&t, format) >> timezone; if (ss.fail()) return -1; +#else + /* Y - m - d T H : M : S */ + constexpr std::size_t stamp_size_without_tz = 4 + 1 + 2 + 1 + 2 + 1 + 2 + 1 + 2 + 1 + 2; + if (!strptime(stamp.data(), format, &t)) { + return -1; + } + const std::string timezone(stamp.data() + stamp_size_without_tz); +#endif if (timezone.empty()) return -1; |