diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H index 719eabff57..c85d22ae2c 100644 --- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H +++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H @@ -447,7 +447,7 @@ public: } //- Same as push_uniq() - FOAM_DEPRECATED_STRICT(2022-10, "push_uniq()") + FOAM_DEPRECATED_FOR(2022-10, "push_uniq()") label appendUniq(const T& val) { return this->push_uniq(val); } }; diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C index 9d34db4381..6249cedb7b 100644 --- a/src/OpenFOAM/containers/Lists/List/List.C +++ b/src/OpenFOAM/containers/Lists/List/List.C @@ -486,35 +486,4 @@ void Foam::sortedOrder } -// * * * * * * * * * * * * * * * Housekeeping * * * * * * * * * * * * * * * // - -#include "SLList.H" - -template -Foam::List::List(const SLList& list) -: - List(list.begin(), list.end(), list.size()) -{} - - -template -void Foam::List::operator=(const SLList& list) -{ - const label len = list.size(); - - reAlloc(len); - - // Cannot use std::copy algorithm - // - SLList doesn't define iterator category - - T* iter = this->begin(); - - for (const T& val : list) - { - *iter = val; - ++iter; - } -} - - // ************************************************************************* // diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H index 76e7c7d94d..d333d8001f 100644 --- a/src/OpenFOAM/containers/Lists/List/List.H +++ b/src/OpenFOAM/containers/Lists/List/List.H @@ -45,7 +45,6 @@ SourceFiles #include "autoPtr.H" #include "UList.H" -#include "SLListFwd.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -404,15 +403,8 @@ public: } //- Same as push_uniq() - FOAM_DEPRECATED_STRICT(2022-10, "push_uniq()") + FOAM_DEPRECATED_FOR(2022-10, "push_uniq()") label appendUniq(const T& val) { return this->push_uniq(val); } - - - //- Copy construct from SLList - explicit List(const SLList& list); - - //- Copy assign from SLList in linear time - void operator=(const SLList& list); }; diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H index a9f63bfb17..fc9f5f8026 100644 --- a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H +++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H @@ -193,7 +193,7 @@ public: void push_back(const word& val) { this->push_uniq(val); } //- Same as push_uniq() - FOAM_DEPRECATED_STRICT(2022-10, "push_uniq method") + FOAM_DEPRECATED_FOR(2022-10, "push_uniq method") label appendUniq(const word& val) { return this->push_uniq(val); } }; diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C index 9a6d3f9b97..a37f5de341 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C @@ -2670,8 +2670,8 @@ void Foam::snappySnapDriver::doSnap surfaceZonesInfo::faceZoneType type; if (meshRefiner_.getFaceZoneInfo(fz.name(), mpI, spI, type)) { - bufPatchIDs.appendUniq(mpI); - bufPatchIDs.appendUniq(spI); + bufPatchIDs.push_uniq(mpI); + bufPatchIDs.push_uniq(spI); } } }