mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0033370: Foundation Classes - Moving into STL and Boost functionality
NCollection containers update: - NCollection_Array1 - updated functionality - NCollection_Array2 - NCollection_Array1 as a wrapper for 2array - NCollection_Vector -> NCollection_DynamicArray was renamed and reworked. TCollection: - Use static empty string to avoid allocations on empty string NCollection allocators update: - NCollection_Allocator - allocator that used Standard::Allocate - NCollection_OccAllocator - allocator-wrapper that used OCC BaseAllocator objects - NCollection_IncAllocator - rework to increase performance Standard: - Rework functionality to use different allocation libs - Implement basic of new way to wrap allocations tools - Define 4 ways to allocation (defines in configure stage) Additional changes: - Hash function uses std::hash functionality - size_t as a hash value - New HashUtils with Murmur and FVN hash algo for x32 and x64 - Deprecated _0.cxx and .gxx DE classes reorganized - Create own utility for std memory - Update Standard_Transient to be more platform-independent Math TK changes: - math_Vector -> match_BaseVector<> - Buffer decreased to cash 32 elements instead of 512
This commit is contained in:
@@ -48,15 +48,6 @@ Standard_Boolean IsEqual (const Handle(VrmlData_Node)& theOne,
|
||||
return aResult;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
// function : HashCode
|
||||
// purpose : Global method
|
||||
//=======================================================================
|
||||
Standard_Integer HashCode (const Handle (VrmlData_Node) & theNode, const Standard_Integer theUpperBound)
|
||||
{
|
||||
return (theNode->Name () == NULL ? 1 : HashCode (theNode->Name (), theUpperBound));
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : VrmlData_Node
|
||||
//purpose :
|
||||
|
@@ -19,7 +19,8 @@
|
||||
#include <NCollection_List.hxx>
|
||||
#include <Standard_Type.hxx>
|
||||
#include <Standard_TypeDef.hxx>
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
#include <Standard_CStringHasher.hxx>
|
||||
#include <VrmlData_ErrorStatus.hxx>
|
||||
|
||||
#define VRMLDATA_LCOMPARE(aa, bb) \
|
||||
@@ -198,13 +199,34 @@ class VrmlData_Node : public Standard_Transient
|
||||
// Definition of HANDLE object using Standard_DefineHandle.hxx
|
||||
DEFINE_STANDARD_HANDLE (VrmlData_Node, Standard_Transient)
|
||||
|
||||
//! Computes a hash code for the given VRML node, in the range [1, theUpperBound]
|
||||
//! @param theNode the VRML node which hash code is to be computed
|
||||
//! @param theUpperBound the upper bound of the range a computing hash code must be within
|
||||
//! @return a computed hash code, in the range [1, theUpperBound]
|
||||
Standard_EXPORT Standard_Integer HashCode (const Handle (VrmlData_Node) & theNode, Standard_Integer theUpperBound);
|
||||
|
||||
Standard_EXPORT Standard_Boolean IsEqual (const Handle(VrmlData_Node)& theOne,
|
||||
const Handle(VrmlData_Node)& theTwo);
|
||||
Standard_EXPORT Standard_Boolean IsEqual(const Handle(VrmlData_Node)& theOne,
|
||||
const Handle(VrmlData_Node)& theTwo);
|
||||
|
||||
namespace std
|
||||
{
|
||||
template <>
|
||||
struct hash<Handle(VrmlData_Node)>
|
||||
{
|
||||
size_t operator()(const Handle(VrmlData_Node)& theNode) const
|
||||
{
|
||||
if (!theNode->Name())
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
return Standard_CStringHasher{}(theNode->Name());
|
||||
}
|
||||
};
|
||||
|
||||
template<>
|
||||
struct equal_to<Handle(VrmlData_Node)>
|
||||
{
|
||||
bool operator()(const Handle(VrmlData_Node)& theNode1,
|
||||
const Handle(VrmlData_Node)& theNode2) const noexcept
|
||||
{
|
||||
return IsEqual(theNode1, theNode2);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user