lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-06 15:05:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update source to v6.11.18282.01000

Browse Source
This commit is contained in:
Will Pearson
2018-10-10 22:43:34 +01:00
parent 08ba072313
commit 80b0545f2b
93 changed files with 8784 additions and 2972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
opennurbs_model_component.cpp
View File

@@ -3819,13 +3819,64 @@ bool ON_BinaryArchive::AddManifestMapItem(
return true;
}
//////////////////////////////////////////////////////////////////////////////////////////////
//
//
//
const ON_ModelComponentReference ON_ModelComponentReference::Empty;
// Explicit implementation to insure m_sp is completely managed in the openurbs DLL.
ON_ModelComponentWeakReference::ON_ModelComponentWeakReference() ON_NOEXCEPT
{}
// Explicit implementation to insure m_sp is completely managed in the openurbs DLL.
ON_ModelComponentWeakReference::~ON_ModelComponentWeakReference()
{}
// Explicit implementation to insure m_sp is completely managed in the openurbs DLL.
ON_ModelComponentWeakReference::ON_ModelComponentWeakReference(const ON_ModelComponentWeakReference& src) ON_NOEXCEPT
: m_wp(src.m_wp)
{}
// Explicit implementation to insure m_sp is completely managed in the openurbs DLL.
ON_ModelComponentWeakReference& ON_ModelComponentWeakReference::operator=(const ON_ModelComponentWeakReference& src)
{
if ( this != &src)
m_wp = src.m_wp;
return *this;
}
#if defined(ON_HAS_RVALUEREF)
ON_ModelComponentWeakReference::ON_ModelComponentWeakReference( ON_ModelComponentWeakReference&& src ) ON_NOEXCEPT
: m_wp(std::move(src.m_wp))
{}
ON_ModelComponentWeakReference& ON_ModelComponentWeakReference::operator=(ON_ModelComponentWeakReference&& src)
{
if ( this != &src )
{
m_wp.reset();
m_wp = std::move(src.m_wp);
}
return *this;
}
#endif
ON_ModelComponentWeakReference::ON_ModelComponentWeakReference(const ON_ModelComponentReference& src) ON_NOEXCEPT
: m_wp(src.m_sp)
{}
ON_ModelComponentWeakReference& ON_ModelComponentWeakReference::operator=(const ON_ModelComponentReference& src)
{
m_wp = src.m_sp;
return *this;
}
//////////////////////////////////////////////////////////////////////////////////////////////
//
//
//
// Explicit implementation to insure m_sp is completely managed in the openurbs DLL.
ON_ModelComponentReference::ON_ModelComponentReference() ON_NOEXCEPT
@@ -3865,6 +3916,22 @@ ON_ModelComponentReference& ON_ModelComponentReference::operator=(ON_ModelCompon
#endif
ON_ModelComponentReference::ON_ModelComponentReference(const ON_ModelComponentWeakReference& src) ON_NOEXCEPT
: m_sp(src.m_wp.lock())
{
// NOTE WELL:
// std::shared_ptr<T>(std::weak_ptr<T>) throws an exception when weak_ptr is empty.
// std::shared_ptr<T>(std::weak_ptr<T>.lock()) constructs and empty shared_ptr when weak_ptr is empty.
}
ON_ModelComponentReference& ON_ModelComponentReference::operator=(const ON_ModelComponentWeakReference& src)
{
m_sp = src.m_wp.lock();
return *this;
}
ON_ModelComponentReference::ON_ModelComponentReference(
std::shared_ptr<ON_ModelComponent>& sp
) ON_NOEXCEPT
@@ -3919,6 +3986,14 @@ const class ON_ModelComponent* ON_ModelComponentReference::ModelComponent() cons
return m_sp.get();
}
class ON_ModelComponent* ON_ModelComponentReference::ExclusiveModelComponent() const ON_NOEXCEPT
{
return
(1 == m_sp.use_count())
? m_sp.get()
: nullptr;
}
ON__UINT64 ON_ModelComponentReference::ModelComponentRuntimeSerialNumber() const ON_NOEXCEPT
{
const ON_ModelComponent* model_component = m_sp.get();