OSDN Git Service

2009-08-14 Benjamin Kosnik <bkoz@redhat.com>
authorbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 14 Aug 2009 16:54:48 +0000 (16:54 +0000)
committerbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 14 Aug 2009 16:54:48 +0000 (16:54 +0000)
* include/ext/pointer.h: Add pragma system_header, use
_GLIBCXX_USE_LONG_LONG, macro cleanup.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150763 138bc75d-0d04-0410-961f-82ee72b054a4

libstdc++-v3/ChangeLog

index 27757d0..c97b588 100644 (file)
@@ -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.