basic_string.h (compare(const basic_string&)): Fully qualify min() with std::.

2002-12-02  Paolo Carlini  <pcarlini@unitus.it>

	* include/bits/basic_string.h (compare(const basic_string&)):
	Fully qualify min() with std::.

From-SVN: r59745

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5d75dd7784bb631c1dbe1ac549416a7b259f5220..3eb41703a9e4188de3eab73d912fc89e5ecee314 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-02  Paolo Carlini  <pcarlini@unitus.it>
+
+       * include/bits/basic_string.h (compare(const basic_string&)):
+        Fully qualify min() with std::.
+
 2002-12-02  Benjamin Kosnik  <bkoz@redhat.com>
 
        * configure.in (libtool_VERSION): Update to 5:2:0.

diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index 0f7247f7c9a98441d2b62177ee9e0e16bd37f9e8..fd56bb81ea084df2bb8b3ecf9cc386d2785823b1 100644 (file)
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -911,7 +911,7 @@ namespace std
       {
        size_type __size = this->size();
        size_type __osize = __str.size();
-       size_type __len = min(__size, __osize);
+       size_type __len = std::min(__size, __osize);
 
        int __r = traits_type::compare(_M_data(), __str.data(), __len);
        if (!__r)