repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d15aeb
)
sync StdString.h
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Sun, 7 Oct 2012 22:06:08 +0000
(
00:06
+0200)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Sun, 7 Oct 2012 22:06:08 +0000
(
00:06
+0200)
src/lib/platform/util/StdString.h
patch
|
blob
|
blame
|
history
diff --git
a/src/lib/platform/util/StdString.h
b/src/lib/platform/util/StdString.h
index 63b3bf12e4899aede8b612eb943413428bd00ad8..00f53bf1ac3a9ab0f890f158ccdae80b6969b615 100644
(file)
--- a/
src/lib/platform/util/StdString.h
+++ b/
src/lib/platform/util/StdString.h
@@
-1,5
+1,4
@@
#pragma once
#pragma once
-#include "lib/platform/os.h"
#include <string>
#include <stdint.h>
#include <vector>
#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)
#if !defined (SS_ANSI) && defined(_MSC_VER)
#undef SS_IS_INTRESOURCE
#if defined(_WIN64)
- #define SS_IS_INTRESOURCE(_r) (((u
nsigned __int64
)(_r) >> 16) == 0)
+ #define SS_IS_INTRESOURCE(_r) (((u
int64_t
)(_r) >> 16) == 0)
#else
#define SS_IS_INTRESOURCE(_r) (((unsigned long)(_r) >> 16) == 0)
#endif
#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);
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 };
SSCodeCvt::state_type st= { 0 };
+#endif
res = conv.in(st,
pSrcA, pSrcA + nSrc, pNextSrcA,
pDstW, pDstW + nDst, pNextDstW);
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);
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 };
SSCodeCvt::state_type st= { 0 };
+#endif
res = conv.out(st,
pSrcW, pSrcW + nSrc, pNextSrcW,
pDstA, pDstA + nDst, pNextDstA);
res = conv.out(st,
pSrcW, pSrcW + nSrc, pNextSrcW,
pDstA, pDstA + nDst, pNextDstA);