From ed90d854b7d3444f34820631d88f62dc34f60ea5 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 28 May 2009 13:41:02 +0000 Subject: [PATCH] Issue 0020370: Symbols multi defined --- src/Controls/SMESH_Controls.cxx | 33 +++++++++++++++++++++++++ src/Controls/SMESH_ControlsDef.hxx | 39 +++++++++--------------------- 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/src/Controls/SMESH_Controls.cxx b/src/Controls/SMESH_Controls.cxx index 932a2473b..f6d48030d 100644 --- a/src/Controls/SMESH_Controls.cxx +++ b/src/Controls/SMESH_Controls.cxx @@ -2942,3 +2942,36 @@ void ElementsOnShape::process (const SMDS_MeshElement* theElemPtr) if (isSatisfy) myIds.Add(theElemPtr->GetID()); } + +TSequenceOfXYZ::TSequenceOfXYZ() +{} + +TSequenceOfXYZ::TSequenceOfXYZ(size_type n) : std::vector(n) +{} + +TSequenceOfXYZ::TSequenceOfXYZ(size_type n, const value_type& t) : std::vector(n,t) +{} + +TSequenceOfXYZ::TSequenceOfXYZ(const TSequenceOfXYZ& theSequenceOfXYZ) : std::vector(theSequenceOfXYZ) +{} + +template +TSequenceOfXYZ::TSequenceOfXYZ(InputIterator theBegin, InputIterator theEnd) : std::vector(theBegin,theEnd) +{} + +TSequenceOfXYZ& TSequenceOfXYZ::operator=(const TSequenceOfXYZ& theSequenceOfXYZ) +{ + std::vector::operator=(theSequenceOfXYZ); + return *this; +} + +std::vector::reference TSequenceOfXYZ::operator()(size_type n) +{ + return std::vector::operator[](n-1); +} + +std::vector::const_reference TSequenceOfXYZ::operator()(size_type n) const +{ + return std::vector::operator[](n-1); +} + diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx index 8fb0cd63f..9d337186c 100644 --- a/src/Controls/SMESH_ControlsDef.hxx +++ b/src/Controls/SMESH_ControlsDef.hxx @@ -69,39 +69,22 @@ namespace SMESH{ class SMESHCONTROLS_EXPORT TSequenceOfXYZ: public std::vector { public: - typedef std::vector TSuperClass; - TSequenceOfXYZ() - {} + TSequenceOfXYZ(); - TSequenceOfXYZ(size_type n): - TSuperClass(n) - {} + TSequenceOfXYZ(size_type n); - TSequenceOfXYZ(size_type n, const value_type& t): - TSuperClass(n,t) - {} + TSequenceOfXYZ(size_type n, const value_type& t); - TSequenceOfXYZ(const TSequenceOfXYZ& theSequenceOfXYZ): - TSuperClass(theSequenceOfXYZ) - {} + TSequenceOfXYZ(const TSequenceOfXYZ& theSequenceOfXYZ); template - TSequenceOfXYZ(InputIterator theBegin, InputIterator theEnd): - TSuperClass(theBegin,theEnd) - {} - - TSequenceOfXYZ& operator=(const TSequenceOfXYZ& theSequenceOfXYZ){ - TSuperClass::operator=(theSequenceOfXYZ); - return *this; - } - - reference operator()(size_type n){ - return TSuperClass::operator[](n-1); - } - - const_reference operator()(size_type n) const{ - return TSuperClass::operator[](n-1); - } + TSequenceOfXYZ(InputIterator theBegin, InputIterator theEnd); + + TSequenceOfXYZ& operator=(const TSequenceOfXYZ& theSequenceOfXYZ); + + reference operator()(size_type n); + + const_reference operator()(size_type n) const; private: reference operator[](size_type n); -- 2.39.2