File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -67,7 +67,7 @@ namespace anyimpl {
67
67
struct default_allocator {
68
68
void * allocate_bytes (std::size_t n, std::size_t a) {
69
69
void * ret =
70
- #if defined(_MSC_VER )
70
+ #if defined(_WIN32 )
71
71
_aligned_malloc (n, a);
72
72
#else
73
73
aligned_alloc (a, n);
@@ -76,7 +76,7 @@ struct default_allocator {
76
76
return ret;
77
77
}
78
78
void deallocate_bytes (void * p, std::size_t /* n*/ , std::size_t /* a*/ ) noexcept {
79
- #if defined(_MSC_VER )
79
+ #if defined(_WIN32 )
80
80
_aligned_free (p);
81
81
#else
82
82
free (p);
Original file line number Diff line number Diff line change @@ -135,7 +135,7 @@ class time_t
135
135
{
136
136
std::tm ret = {};
137
137
auto mt = std::time_t (*this );
138
- #if defined(_MSC_VER )
138
+ #if defined(_WIN32 )
139
139
gmtime_s (&ret, &mt);
140
140
#else
141
141
gmtime_r (&mt, &ret);
@@ -147,7 +147,7 @@ class time_t
147
147
{
148
148
std::tm ret = {};
149
149
auto mt = std::time_t (*this );
150
- #if defined(_MSC_VER )
150
+ #if defined(_WIN32 )
151
151
localtime_s (&ret, &mt);
152
152
#else
153
153
localtime_r (&mt, &ret);
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ TEST_CASE("[time_t] tm")
62
62
CHECK (lt.tm_year == 101 );
63
63
CHECK ((lt.tm_wday == 0 || lt.tm_wday == 1 ));
64
64
65
- #if !defined(__APPLE__)
65
+ #if !defined(__APPLE__) && !defined(__MINGW32__)
66
66
// macs have some weird problem with std::locale
67
67
// but I don't have the time (or patience) to debug it now :)
68
68
std::locale::global (std::locale (" en_US.UTF8" ));
You can’t perform that action at this time.
0 commit comments