From: Benjamin Kosnik <bkoz@gcc.gnu.org>
Date: Fri, 14 Aug 2009 16:54:48 +0000 (+0000)
Subject: pointer.h: Add pragma system_header, use _GLIBCXX_USE_LONG_LONG, macro cleanup.
X-Git-Tag: releases/gcc-4.5.0~4026
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=938cfa0f3d54859fa2ec177417f83a64dd10ca6a;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 27757d073326..c97b588dcdde 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.