From eebcd854c55d289f02563225c062b0a2bc13ae43 Mon Sep 17 00:00:00 2001 From: aandrei Date: Thu, 27 Jun 2002 22:27:28 +0000 Subject: [PATCH] no message git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@27 7ec92016-0320-0410-acc4-a06ded1c099a --- AssocVector.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/AssocVector.h b/AssocVector.h index bbb78bc..2b4386e 100644 --- a/AssocVector.h +++ b/AssocVector.h @@ -104,7 +104,7 @@ namespace Loki typedef typename Base::reverse_iterator reverse_iterator; typedef typename Base::const_reverse_iterator const_reverse_iterator; - class value_compare + class value_compare : public std::binary_function , private key_compare { @@ -138,9 +138,9 @@ namespace Loki AssocVector& operator=(const AssocVector& rhs) { - AssocVector(rhs).swap(*this); - return *this; - } + AssocVector(rhs).swap(*this); + return *this; + } // iterators: // The following are here because MWCW gets 'using' wrong @@ -208,7 +208,7 @@ namespace Loki void swap(AssocVector& other) { - using namespace std; + using std::swap; Base::swap(other); MyCompare& me = *this; MyCompare& rhs = other; @@ -329,6 +329,7 @@ namespace Loki // June 20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!! // January 22, 2002: fixed operator= - credit due to Tom Hyer // June 25, 2002: fixed template insert() - credit due to Robert Minsk +// June 27, 2002: fixed member swap() - credit due to David Brookman //////////////////////////////////////////////////////////////////////////////// #endif // ASSOCVECTOR_INC_