~singpolyma/biboumi

c54f28d29d5f1d7a2bb973609beffbe5ad56d422 — louiz’ 7 years ago dfc0793
Conditionally use strptime if we don’t have std::get_time
3 files changed, 26 insertions(+), 1 deletions(-)

M louloulibs/CMakeLists.txt
M louloulibs/louloulibs.h.cmake
M louloulibs/utils/time.cpp
M louloulibs/CMakeLists.txt => louloulibs/CMakeLists.txt +13 -0
@@ 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)

M louloulibs/louloulibs.h.cmake => louloulibs/louloulibs.h.cmake +2 -1
@@ 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

M louloulibs/utils/time.cpp => louloulibs/utils/time.cpp +11 -0
@@ 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;