aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2006-12-03 17:15:46 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2006-12-03 17:15:46 +0000
commit6bd70157d787279821301c22a8f8315af4ea1cd1 (patch)
tree3801af459f84f76ac2279142fe6f6d4068498f18
parenta77f72d36ec03f42ff67150ddd39fdc85b83b3be (diff)
downloadgcc-6bd70157d787279821301c22a8f8315af4ea1cd1.zip
gcc-6bd70157d787279821301c22a8f8315af4ea1cd1.tar.gz
gcc-6bd70157d787279821301c22a8f8315af4ea1cd1.tar.bz2
re PR libstdc++/29989 (missed #undef min/max in <limits>)
2006-12-03 Paolo Carlini <pcarlini@suse.de> PR libstdc++/29989 * include/bits/stl_algobase.h: Remove min and max #undefs. From-SVN: r119467
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/stl_algobase.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1031465..21e5347 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-03 Paolo Carlini <pcarlini@suse.de>
+
+ PR libstdc++/29989
+ * include/bits/stl_algobase.h: Remove min and max #undefs.
+
2006-12-02 Howard Hinnant <hhinnant@apple.com>
* acinclude.m4: Allow OPTIMIZE_CXXFLAGS to be set by configure.host.
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index 2c603eb..4623c61 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -167,9 +167,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
iter_swap(__a, __b);
}
-#undef min
-#undef max
-
/**
* @brief This does what you think it does.
* @param a A thing of arbitrary type.