diff options
author | Milo Yip <miloyip@gmail.com> | 2019-12-03 04:51:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-03 04:51:05 +0300 |
commit | dfbe1db9da455552f7a9ad5d2aea17dd9d832ac1 (patch) | |
tree | e1d3e243b4d9a4c5b4307d8240637242bb2b5b99 /example | |
parent | eeb9d553f83f86e7b5bf22cbacf1d5d8b44608e5 (diff) | |
parent | 92f99bc2ee1c04669036ba2a35ef76ad1c2cad79 (diff) |
Merge pull request #1502 from ylavic/compilation_fixes
Compilation fixes
Diffstat (limited to 'example')
-rw-r--r-- | example/sortkeys/sortkeys.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/example/sortkeys/sortkeys.cpp b/example/sortkeys/sortkeys.cpp index c4737849..7ede9fb9 100644 --- a/example/sortkeys/sortkeys.cpp +++ b/example/sortkeys/sortkeys.cpp @@ -45,9 +45,8 @@ int main() { // C++11 supports std::move() of Value so it always have no problem for std::sort(). // Some C++03 implementations of std::sort() requires copy constructor which causes compilation error. // Needs a sorting function only depends on std::swap() instead. -#if __cplusplus >= 201103L || !defined(__GLIBCXX__) +#if __cplusplus >= 201103L || (!defined(__GLIBCXX__) && (!defined(_MSC_VER) || _MSC_VER >= 1900)) std::sort(d.MemberBegin(), d.MemberEnd(), NameComparator()); -#endif printIt(d); @@ -59,4 +58,5 @@ int main() { "zeta": false } */ +#endif } |