generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-17 01:15:59 +01:00
Code Issues Projects Releases Wiki Activity

work around static union member (non-C++03)

Browse Source
This commit is contained in:
Alex
2013-02-05 22:56:03 -06:00
parent 21da0129b6
commit 2661b54ff6
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Foundation/include/Poco/Any.h
View File

@@ -69,7 +69,11 @@ union Placeholder
/// where the object was allocated (0 => heap, 1 => local).
{
public:
static const unsigned int SIZE = SizeV;
struct Size
{
static const unsigned int value = SizeV;
};
Placeholder ()
{
@@ -83,12 +87,12 @@ public:
bool isLocal() const
{
return holder[SIZE] != 0;
return holder[SizeV] != 0;
}
void setLocal(bool local) const
{
holder[SIZE] = local ? 1 : 0;
holder[SizeV] = local ? 1 : 0;
}
PlaceholderT* content() const
@@ -101,7 +105,7 @@ public:
private:
PlaceholderT* pHolder;
mutable unsigned char holder[SIZE + 1];
mutable unsigned char holder[SizeV + 1];
friend class Any;
friend class Dynamic::Var;
@@ -211,7 +215,7 @@ public:
/// Returns true if the Any is empty.
{
char buf[POCO_SMALL_OBJECT_SIZE] = { 0 };
return 0 == std::memcmp(_valueHolder.holder, buf, _valueHolder.SIZE);
return 0 == std::memcmp(_valueHolder.holder, buf, POCO_SMALL_OBJECT_SIZE);
}
const std::type_info & type() const
@@ -252,7 +256,7 @@ private:
virtual void clone(Placeholder<ValueHolder>* pPlaceholder) const
{
if ((sizeof(Holder<ValueType>) <= pPlaceholder->SIZE))
if ((sizeof(Holder<ValueType>) <= POCO_SMALL_OBJECT_SIZE))
{
new ((ValueHolder*) pPlaceholder->holder) Holder(_held);
pPlaceholder->setLocal(true);
@@ -278,7 +282,7 @@ private:
template<typename ValueType>
void construct(const ValueType& value)
{
if (sizeof(Holder<ValueType>) <= _valueHolder.SIZE)
if (sizeof(Holder<ValueType>) <= Placeholder<ValueType>::Size::value)
{
new (reinterpret_cast<ValueHolder*>(_valueHolder.holder)) Holder<ValueType>(value);
_valueHolder.setLocal(true);

4
Foundation/include/Poco/Dynamic/Var.h
View File

@@ -584,7 +584,7 @@ private:
template<typename ValueType>
void construct(const ValueType& value)
{
if (sizeof(VarHolderImpl<ValueType>) <= _placeholder.SIZE)
if (sizeof(VarHolderImpl<ValueType>) <= Placeholder<ValueType>::Size::value)
{
new (reinterpret_cast<VarHolder*>(_placeholder.holder)) VarHolderImpl<ValueType>(value);
_placeholder.setLocal(true);
@@ -599,7 +599,7 @@ private:
void construct(const char* value)
{
std::string val(value);
if (sizeof(VarHolderImpl<std::string>) <= _placeholder.SIZE)
if (sizeof(VarHolderImpl<std::string>) <= Placeholder<std::string>::Size::value)
{
new (reinterpret_cast<VarHolder*>(_placeholder.holder)) VarHolderImpl<std::string>(val);
_placeholder.setLocal(true);

2
Foundation/include/Poco/Dynamic/VarHolder.h
View File

@@ -222,7 +222,7 @@ protected:
return new VarHolderImpl<T>(val);
#else
poco_check_ptr (pVarHolder);
if ((sizeof(VarHolderImpl<T>) <= pVarHolder->SIZE))
if ((sizeof(VarHolderImpl<T>) <= Placeholder<T>::Size::value))
{
new ((VarHolder*) pVarHolder->holder) VarHolderImpl<T>(val);
pVarHolder->setLocal(true);