From be52c4935872387e07e17390375e43ff65a8fc78 Mon Sep 17 00:00:00 2001 From: Laurent Le Flem Date: Fri, 28 Mar 2025 13:08:22 +0100 Subject: [PATCH] Fixing some missing stuff in VS 2022 --- libraries/openexr/IlmImf/ImfAttribute.cpp | 2 ++ windows/cmedit/StdString.h | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libraries/openexr/IlmImf/ImfAttribute.cpp b/libraries/openexr/IlmImf/ImfAttribute.cpp index cb4ac3607..1dd3c9a42 100644 --- a/libraries/openexr/IlmImf/ImfAttribute.cpp +++ b/libraries/openexr/IlmImf/ImfAttribute.cpp @@ -45,6 +45,8 @@ #include "Iex.h" #include #include +#include +#include #include "ImfNamespace.h" diff --git a/windows/cmedit/StdString.h b/windows/cmedit/StdString.h index aa16cfedd..bf767d9d2 100644 --- a/windows/cmedit/StdString.h +++ b/windows/cmedit/StdString.h @@ -64,7 +64,7 @@ // - Jim Cline // - Jeff Kohn // - Todd Heckel -// - Ullrich Pollähne +// - Ullrich Poll�hne // - Joe Vitaterna // - Joe Woodbury // - Aaron (no last name) @@ -212,7 +212,7 @@ // 2000-APR-17 - Thanks to Joe Vitaterna for pointing out that ReverseFind // is supposed to be a const function. // -// 2000-MAR-07 - Thanks to Ullrich Pollähne for catching a range bug in one +// 2000-MAR-07 - Thanks to Ullrich Poll�hne for catching a range bug in one // of the overloads of assign. // // 2000-FEB-01 - You can now use CStdString on the Mac with CodeWarrior! @@ -714,7 +714,7 @@ inline const Type& SSMAX(const Type& arg1, const Type& arg2) #endif #define SS_USE_FACET(loc, fac) std::use_facet(loc) #elif defined(_MSC_VER ) - #define SS_USE_FACET(loc, fac) std::_USE(loc, fac) + #define SS_USE_FACET(loc, fac) std::use_facet(loc) // ...and #elif defined(_RWSTD_NO_TEMPLATE_ON_RETURN_TYPE) @@ -2090,7 +2090,7 @@ class CStdStr : public std::basic_string // or the NULL terminator, whichever comes first. Since we // are about to call a less forgiving overload (in which // must be a valid length), we must adjust the length here to a safe - // value. Thanks to Ullrich Pollähne for catching this bug + // value. Thanks to Ullrich Poll�hne for catching this bug nChars = SSMIN(nChars, str.length() - nStart); @@ -2121,7 +2121,7 @@ class CStdStr : public std::basic_string // or the NULL terminator, whichever comes first. Since we // are about to call a less forgiving overload (in which // must be a valid length), we must adjust the length here to a safe - // value. Thanks to Ullrich Pollähne for catching this bug + // value. Thanks to Ullrich Poll�hne for catching this bug nChars = SSMIN(nChars, str.length() - nStart);