razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

remove BOOST_NO_RVALUE_REFERENCES

Browse source
This commit is contained in:
Shinya Kitaoka 2016-04-14 16:55:33 +09:00
parent e5734ac437
commit d57726081c
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
toonz/sources/include/ext/plasticskeleton.h
View file

@ -139,14 +139,10 @@ public:
std::vector<PlasticHandle> verticesToHandles() const; std::vector<PlasticHandle> verticesToHandles() const;
public: public:
// RValues-related functions // RValues-related functions
#ifndef BOOST_NO_RVALUE_REFERENCES
PlasticSkeleton(PlasticSkeleton &&other); PlasticSkeleton(PlasticSkeleton &&other);
PlasticSkeleton &operator=(PlasticSkeleton &&other); PlasticSkeleton &operator=(PlasticSkeleton &&other);
#endif
private: private:
friend class PlasticSkeletonDeformation; // Skeleton deformations can register to be notified friend class PlasticSkeletonDeformation; // Skeleton deformations can register to be notified

14
toonz/sources/tnzext/plasticskeleton.cpp
View file

@ -103,12 +103,8 @@ public:
Imp(const Imp &other); Imp(const Imp &other);
Imp &operator=(const Imp &other); Imp &operator=(const Imp &other);
#ifndef BOOST_NO_RVALUE_REFERENCES
Imp(Imp &&other); Imp(Imp &&other);
Imp &operator=(Imp &&other); Imp &operator=(Imp &&other);
#endif
}; };
//=============================================================================== //===============================================================================
@ -127,9 +123,6 @@ PlasticSkeleton::Imp &PlasticSkeleton::Imp::operator=(const Imp &other)
} }
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
#ifndef BOOST_NO_RVALUE_REFERENCES
PlasticSkeleton::Imp::Imp(Imp &&other) PlasticSkeleton::Imp::Imp(Imp &&other)
: m_numbersPool(std::move(other.m_numbersPool)) : m_numbersPool(std::move(other.m_numbersPool))
{ {
@ -143,8 +136,6 @@ PlasticSkeleton::Imp &PlasticSkeleton::Imp::operator=(Imp &&other)
return *this; return *this;
} }
#endif
//************************************************************************************ //************************************************************************************
// PlasticSkeleton implementation // PlasticSkeleton implementation
//************************************************************************************ //************************************************************************************
@ -181,9 +172,6 @@ PlasticSkeleton &PlasticSkeleton::operator=(const PlasticSkeleton &other)
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
#ifndef BOOST_NO_RVALUE_REFERENCES
PlasticSkeleton::PlasticSkeleton(PlasticSkeleton &&other) PlasticSkeleton::PlasticSkeleton(PlasticSkeleton &&other)
: mesh_type(std::forward<mesh_type>(other)), m_imp(new Imp(std::move(*other.m_imp))) : mesh_type(std::forward<mesh_type>(other)), m_imp(new Imp(std::move(*other.m_imp)))
{ {
@ -201,8 +189,6 @@ PlasticSkeleton &PlasticSkeleton::operator=(PlasticSkeleton &&other)
return *this; return *this;
} }
#endif
//------------------------------------------------------------------ //------------------------------------------------------------------
void PlasticSkeleton::addListener(PlasticSkeletonDeformation *deformation) void PlasticSkeleton::addListener(PlasticSkeletonDeformation *deformation)