From c01e7bea15b9d82fe8b616b022f82265d9b437a2 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Mon, 8 Oct 2012 00:06:08 +0200 Subject: [PATCH] sync StdString.h --- src/lib/platform/util/StdString.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/lib/platform/util/StdString.h b/src/lib/platform/util/StdString.h index 63b3bf1..00f53bf 100644 --- a/src/lib/platform/util/StdString.h +++ b/src/lib/platform/util/StdString.h @@ -1,5 +1,4 @@ #pragma once -#include "lib/platform/os.h" #include #include #include @@ -364,7 +363,7 @@ #if !defined (SS_ANSI) && defined(_MSC_VER) #undef SS_IS_INTRESOURCE #if defined(_WIN64) - #define SS_IS_INTRESOURCE(_r) (((unsigned __int64)(_r) >> 16) == 0) + #define SS_IS_INTRESOURCE(_r) (((uint64_t)(_r) >> 16) == 0) #else #define SS_IS_INTRESOURCE(_r) (((unsigned long)(_r) >> 16) == 0) #endif @@ -865,7 +864,11 @@ inline const Type& SSMAX(const Type& arg1, const Type& arg2) PWSTR pNextDstW = pDstW; SSCodeCvt::result res = SSCodeCvt::ok; const SSCodeCvt& conv = SS_USE_FACET(loc, SSCodeCvt); +#if defined(TARGET_DARWIN) || defined(__FreeBSD__) || defined(TARGET_ANDROID) + SSCodeCvt::state_type st= { { 0 } }; +#else SSCodeCvt::state_type st= { 0 }; +#endif res = conv.in(st, pSrcA, pSrcA + nSrc, pNextSrcA, pDstW, pDstW + nDst, pNextDstW); @@ -908,7 +911,11 @@ inline const Type& SSMAX(const Type& arg1, const Type& arg2) PCWSTR pNextSrcW = pSrcW; SSCodeCvt::result res = SSCodeCvt::ok; const SSCodeCvt& conv = SS_USE_FACET(loc, SSCodeCvt); +#if defined(TARGET_DARWIN) || defined(__FreeBSD__) || defined(TARGET_ANDROID) + SSCodeCvt::state_type st= { { 0 } }; +#else SSCodeCvt::state_type st= { 0 }; +#endif res = conv.out(st, pSrcW, pSrcW + nSrc, pNextSrcW, pDstA, pDstA + nDst, pNextDstA); -- 2.34.1