aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@gcc.gnu.org>2009-08-14 16:54:48 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2009-08-14 16:54:48 +0000
commit938cfa0f3d54859fa2ec177417f83a64dd10ca6a (patch)
treedcff733956a035213df726f4de8bcada1c0cdcf7
parentb4d647763721373fa5cda59a933c1300e395a6ad (diff)
downloadgcc-938cfa0f3d54859fa2ec177417f83a64dd10ca6a.zip
gcc-938cfa0f3d54859fa2ec177417f83a64dd10ca6a.tar.gz
gcc-938cfa0f3d54859fa2ec177417f83a64dd10ca6a.tar.bz2
pointer.h: Add pragma system_header, use _GLIBCXX_USE_LONG_LONG, macro cleanup.
2009-08-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pointer.h: Add pragma system_header, use _GLIBCXX_USE_LONG_LONG, macro cleanup. From-SVN: r150763
-rw-r--r--libstdc++-v3/ChangeLog3
1 files changed, 0 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 27757d0..c97b588 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,15 +1,12 @@
-<<<<<<< .mine
2009-08-14 Benjamin Kosnik <bkoz@redhat.com>
* include/ext/pointer.h: Add pragma system_header, use
_GLIBCXX_USE_LONG_LONG, macro cleanup.
-=======
2009-08-14 Uros Bizjak <ubizjak@gmail.com>
* src/compatibility-ldbl.cc: Include cmath.
->>>>>>> .r150760
2009-08-13 Benjamin Kosnik <bkoz@redhat.com>
* src/compatibility-ldbl.cc: Include tr1/functional.