summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Object.cpp4
-rw-r--r--cpp/src/IcePatch/IcePatchI.cpp10
-rw-r--r--cpp/src/XMLTransform/XMLTransform.cpp101
3 files changed, 61 insertions, 54 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index ae3a08265df..e31304a2137 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -258,7 +258,7 @@ Ice::Object::__unmarshal(const ::Ice::StreamPtr& __is)
{
IceUtil::Mutex::Lock sync(_activeFacetMapMutex);
- Int sz = __is->startReadDictionary("ice::facets");
+ Int sz = __is->startReadDictionary("ice:facets");
_activeFacetMap.clear();
_activeFacetMapHint = _activeFacetMap.end();
@@ -268,7 +268,7 @@ Ice::Object::__unmarshal(const ::Ice::StreamPtr& __is)
__is->startReadDictionaryElement();
pair<string, ObjectPtr> v;
v.first = __is->readString("ice:key");
- v.second = __is->readObject("ice::value", "", 0);
+ v.second = __is->readObject("ice:value", "", 0);
_activeFacetMapHint = _activeFacetMap.insert(_activeFacetMapHint, v);
__is->endReadDictionaryElement();
}
diff --git a/cpp/src/IcePatch/IcePatchI.cpp b/cpp/src/IcePatch/IcePatchI.cpp
index c50661455b7..44294fa2a6a 100644
--- a/cpp/src/IcePatch/IcePatchI.cpp
+++ b/cpp/src/IcePatch/IcePatchI.cpp
@@ -66,7 +66,7 @@ IcePatch::FileI::readMD5(const Current& current) const
return getMD5(path);
}
- catch(const IceUtil::LockedException&)
+ catch(const IceUtil::ThreadLockedException&)
{
throw BusyException();
}
@@ -134,7 +134,7 @@ IcePatch::DirectoryI::getContents(const Current& current) const
}
}
}
- catch(const IceUtil::LockedException&)
+ catch(const IceUtil::ThreadLockedException&)
{
throw BusyException();
}
@@ -218,7 +218,7 @@ IcePatch::RegularI::getBZ2Size(const Current& current) const
return infoBZ2.size;
}
- catch(const IceUtil::LockedException&)
+ catch(const IceUtil::ThreadLockedException&)
{
throw BusyException();
}
@@ -257,7 +257,7 @@ IcePatch::RegularI::getBZ2(Int pos, Int num, const Current& current) const
return IcePatch::getBZ2(path, pos, num);
}
- catch(const IceUtil::LockedException&)
+ catch(const IceUtil::ThreadLockedException&)
{
throw BusyException();
}
@@ -296,7 +296,7 @@ IcePatch::RegularI::getBZ2MD5(Int size, const Current& current) const
return IcePatch::calcPartialMD5(path + ".bz2", size);
}
- catch(const IceUtil::LockedException&)
+ catch(const IceUtil::ThreadLockedException&)
{
throw BusyException();
}
diff --git a/cpp/src/XMLTransform/XMLTransform.cpp b/cpp/src/XMLTransform/XMLTransform.cpp
index 02e72eb744d..9120d455771 100644
--- a/cpp/src/XMLTransform/XMLTransform.cpp
+++ b/cpp/src/XMLTransform/XMLTransform.cpp
@@ -1078,7 +1078,6 @@ public:
private:
- friend struct StringTypeTable;
enum Type
{
TypeInteger, // byte, short, int, long
@@ -1189,10 +1188,62 @@ private:
// transform.
//
TransformMap _defaultInitializedTransforms;
+
+ //
+ // Why won't MSVC allow name to be a string?
+ //
+ struct StringTypeTable
+ {
+ const char* name; // COMPILERFIX: const string name;
+ Type type;
+
+ bool operator==(const string& rhs) const
+ {
+ return string(name) == rhs;
+ }
+ };
+
+ static const StringTypeTable items[];
+ static const StringTypeTable* itemsBegin;
+ static const StringTypeTable* itemsEnd;
+
+ static const StringTypeTable itemsByName[];
+ static const StringTypeTable* itemsByNameBegin;
+ static const StringTypeTable* itemsByNameEnd;
};
} // End of namespace XMLTransform
+const TransformFactory::StringTypeTable TransformFactory::items[] =
+{
+ { "enumeration", TransformFactory::TypeEnumeration },
+ { "struct", TransformFactory::TypeStruct },
+ { "class", TransformFactory::TypeClass },
+ { "exception", TransformFactory::TypeException },
+ { "dictionary", TransformFactory::TypeDictionary },
+ { "sequence", TransformFactory::TypeSequence },
+ { "proxy", TransformFactory::TypeProxy },
+ { "reference", TransformFactory::TypeReference },
+ { "internal", TransformFactory::TypeInternal }
+};
+const TransformFactory::StringTypeTable* TransformFactory::itemsBegin = &items[0];
+const TransformFactory::StringTypeTable* TransformFactory::itemsEnd = &items[sizeof(items) /
+ sizeof(items[0])];
+
+const TransformFactory::StringTypeTable TransformFactory::itemsByName[] =
+{
+ { "xs:byte", TransformFactory::TypeInteger },
+ { "xs:short", TransformFactory::TypeInteger },
+ { "xs:int", TransformFactory::TypeInteger },
+ { "xs:long", TransformFactory::TypeInteger },
+ { "xs:float", TransformFactory::TypeFloat },
+ { "xs:double", TransformFactory::TypeFloat },
+ { "xs:string", TransformFactory::TypeString },
+};
+const TransformFactory::StringTypeTable* TransformFactory::itemsByNameBegin = &itemsByName[0];
+const TransformFactory::StringTypeTable* TransformFactory::itemsByNameEnd = &itemsByName[sizeof(itemsByName) /
+ sizeof(itemsByName[0])];
+
//
// Constructor & destructor.
//
@@ -1499,37 +1550,6 @@ XMLTransform::TransformFactory::findType(const DocumentMap& docs, const Document
return false;
}
-namespace XMLTransform
-{
-
-//
-// Why won't MSVC allow name to be a string?
-//
-struct StringTypeTable
-{
- const char* name; // COMPILERFIX: const string name;
- TransformFactory::Type type;
-
- bool operator==(const string& rhs) const { return string(name) == rhs; }
-};
-
-}
-
-static const StringTypeTable items[] =
-{
- { "enumeration", TypeEnumeration },
- { "struct", TypeStruct },
- { "class", TypeClass },
- { "exception", TypeException },
- { "dictionary", TypeDictionary },
- { "sequence", TypeSequence },
- { "proxy", TypeProxy },
- { "reference", TypeReference },
- { "internal", TypeInternal }
-};
-static const StringTypeTable* itemsBegin = &items[0];
-static const StringTypeTable* itemsEnd = &items[sizeof(items)/sizeof(items[0])];
-
TransformFactory::Type
XMLTransform::TransformFactory::getType(DOMNode* node)
{
@@ -1560,7 +1580,7 @@ XMLTransform::TransformFactory::getType(DOMNode* node)
}
const StringTypeTable* p = find(itemsBegin, itemsEnd, type);
- if(p == end)
+ if(p == itemsEnd)
{
InvalidSchema ex(__FILE__, __LINE__);
ex.reason = "no type found for element " + getNameAttribute(node);
@@ -1570,19 +1590,6 @@ XMLTransform::TransformFactory::getType(DOMNode* node)
return p->type;
}
-static const StringTypeTable itemsByName[] =
-{
- { "xs:byte", TypeInteger },
- { "xs:short", TypeInteger },
- { "xs:int", TypeInteger },
- { "xs:long", TypeInteger },
- { "xs:float", TypeFloat },
- { "xs:double", TypeFloat },
- { "xs:string", TypeString },
-};
-static const StringTypeTable* itemsByNameBegin = &itemsByName[0];
-static const StringTypeTable* itemsByNameEnd = &itemsByName[sizeof(itemsByName)/sizeof(itemsByName[0])];
-
TransformFactory::Type
XMLTransform::TransformFactory::getTypeByName(const DocumentMap& docs, const DocumentInfoPtr& info, const string& type,
DOMNode*& n, DocumentInfoPtr& nInfo)
@@ -1591,7 +1598,7 @@ XMLTransform::TransformFactory::getTypeByName(const DocumentMap& docs, const Doc
// First check to see if the type is a primitive schema type.
//
const StringTypeTable* p = find(itemsByNameBegin, itemsByNameEnd, type);
- if(p != end)
+ if(p != itemsByNameEnd)
{
return p->type;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 10:42:41 +0000