Mercurial > hg > orthanc
changeset 3739:a35fb06514e7 storage-commitment
integration mainline->storage-commitment
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 10 Mar 2020 20:54:33 +0100 |
| parents | bff4da769f6f (current diff) c1550e710410 (diff) |
| children | e69c556f1913 |
| files | |
| diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/Compatibility.h Tue Mar 10 20:53:40 2020 +0100 +++ b/Core/Compatibility.h Tue Mar 10 20:54:33 2020 +0100 @@ -40,16 +40,23 @@ #if (defined _MSC_VER) //# pragma message("_MSC_VER = " Orthanc_Compatibility_h_STR1(_MSC_VER)) +//# pragma message("_MSVC_LANG = " Orthanc_Compatibility_h_STR1(_MSVC_LANG)) // The __cplusplus macro cannot be used in Visual C++ < 1914 (VC++ 15.7) // However, even in recent versions, __cplusplus will only be correct (that is, // correctly defines the supported C++ version) if a special flag is passed to // the compiler ("/Zc:__cplusplus") // To make this header more robust, we use the _MSVC_LANG equivalent macro. -# if (defined _MSVC_LANG) && (_MSVC_LANG >= 201103L) + +// please note that not all C++11 features are supported when _MSC_VER == 1600 +// (or higher). This header file can be made for fine-grained, if required, +// based on specific _MSC_VER values + +# if _MSC_VER >= 1600 # define ORTHANC_Cxx03_DETECTED 0 # else # define ORTHANC_Cxx03_DETECTED 1 # endif + #else // of _MSC_VER is not defined, we assume __cplusplus is correctly defined // if __cplusplus is not defined (very old compilers??), then the following