diff options
| author | Paolo Carlini <pcarlini@unitus.it> | 2002-12-02 23:15:54 +0100 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2002-12-02 22:15:54 +0000 |
| commit | 61b8da3733cfa15ed60eb93615b37e716af2fc5e (patch) | |
| tree | 49c9f2ea5016b5e1e9d11338d04d613fd88c01c0 /libstdc++-v3 | |
| parent | bbc13bf693fc584139c71b91f2baa9d1a8caa87f (diff) | |
| download | gcc-61b8da3733cfa15ed60eb93615b37e716af2fc5e.tar.gz | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5d75dd7784b..3eb41703a9e 100644 --- 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 0f7247f7c9a..fd56bb81ea0 100644 --- 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) |