mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0027960: Configuration - fix compilation of OSD_Directory with MinGW-w64
Check _NATIVE_WCHAR_T_DEFINED only within _MSC_VER since it is msvc-specific.
This commit is contained in:
@@ -96,7 +96,7 @@ public:
|
||||
NCollection_UtfString (const Standard_Utf32Char* theCopyUtf32,
|
||||
const Standard_Integer theLength = -1);
|
||||
|
||||
#if !defined(_WIN32) || defined(_NATIVE_WCHAR_T_DEFINED) || (defined(_MSC_VER) && _MSC_VER >= 1900)
|
||||
#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) || (defined(_MSC_VER) && _MSC_VER >= 1900)
|
||||
//! Copy constructor from NULL-terminated wide UTF string.
|
||||
//! @param theCopyUtfWide NULL-terminated wide UTF string to copy
|
||||
//! @param theLength the length limit in Unicode symbols (NOT bytes!)
|
||||
|
@@ -179,7 +179,7 @@ NCollection_UtfString<Type>::NCollection_UtfString (const Standard_Utf32Char* th
|
||||
FromUnicode (theCopyUtf32, theLength);
|
||||
}
|
||||
|
||||
#if !defined(_WIN32) || defined(_NATIVE_WCHAR_T_DEFINED) || (defined(_MSC_VER) && _MSC_VER >= 1900)
|
||||
#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) || (defined(_MSC_VER) && _MSC_VER >= 1900)
|
||||
// =======================================================================
|
||||
// function : NCollection_UtfString
|
||||
// purpose :
|
||||
|
Reference in New Issue
Block a user