From 95806cd1cd4d71493963c5327ad4f6df28599d62 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 12 Apr 2001 15:35:56 +0000 Subject: [PATCH] MSVC can't handle partial template specializations (swap), so removed removed swap> and renamed epicsSwap> to epicsListSwap --- src/libCom/cppStd/epicsList.h | 5 +---- src/libCom/test/epicsListTest.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libCom/cppStd/epicsList.h b/src/libCom/cppStd/epicsList.h index c139dcd1f..f55cdbad9 100644 --- a/src/libCom/cppStd/epicsList.h +++ b/src/libCom/cppStd/epicsList.h @@ -82,10 +82,7 @@ friend class epicsListConstIterator; // Specialized algorithms: template - inline void swap(epicsList& x, epicsList& y) { x.swap(y); } - -template - inline void epicsSwap(epicsList& x, epicsList& y) { x.swap(y); } + inline void epicsListSwap(epicsList& x, epicsList& y) { x.swap(y); } // Mutable iterator diff --git a/src/libCom/test/epicsListTest.cpp b/src/libCom/test/epicsListTest.cpp index 578b65064..c1408ca75 100644 --- a/src/libCom/test/epicsListTest.cpp +++ b/src/libCom/test/epicsListTest.cpp @@ -125,7 +125,7 @@ int MAIN(int /*argc*/, char* /*argv[]*/) { epicsList Freda; test(Freda.empty()); - epicsSwap(Fred, Freda); + epicsListSwap(Fred, Freda); test(Fred.empty()); test(Freda.size() == 3); test(Freda.front() == apf[0]);