From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sun, 7 Oct 2012 22:06:08 +0000 (+0200)
Subject: sync StdString.h
X-Git-Tag: upstream/2.2.0~1^2~17^2^2~12
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=c01e7bea15b9d82fe8b616b022f82265d9b437a2;p=deb_libcec.git

sync StdString.h
---

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 <string>
 #include <stdint.h>
 #include <vector>
@@ -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);