Skip to content

Fix compilation on MSVC where __cplusplus macro is old #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sormo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compilation on MSVC where __cplusplus macro is old #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions include/croncpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@
#include <limits>
#include <type_traits>

#if __cplusplus > 201402L
#if defined(_MSVC_LANG)
#define CRONCPP_CPLUSPLUS _MSVC_LANG
#else
#define CRONCPP_CPLUSPLUS __cplusplus
#endif

#if CRONCPP_CPLUSPLUS > 201402L
#include <string_view>
#define CRONCPP_IS_CPP17
#endif
Expand Down Expand Up @@ -375,7 +381,7 @@ namespace cron
inline std::tm to_tm(CRONCPP_STRING_VIEW time)
{
std::tm result;
#if __cplusplus > 201103L
#if CRONCPP_CPLUSPLUS > 201103L
std::istringstream str(time.data());
str.imbue(std::locale(setlocale(LC_ALL, nullptr)));

Expand Down Expand Up @@ -403,7 +409,7 @@ namespace cron

inline std::string to_string(std::tm const & tm)
{
#if __cplusplus > 201103L
#if CRONCPP_CPLUSPLUS > 201103L
std::ostringstream str;
str.imbue(std::locale(setlocale(LC_ALL, nullptr)));
str << std::put_time(&tm, "%Y-%m-%d %H:%M:%S");
Expand Down