From patchwork Sat Oct  6 00:33:00 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Fix inclusion of cxxabi_forced.h in dynamic_bitset
Date: Fri, 05 Oct 2012 14:33:00 -0000
From: Joe Seymour <jseymour@codesourcery.com>
X-Patchwork-Id: 189638
Message-Id: <506F7C3C.7080607@codesourcery.com>
To: <gcc-patches@gcc.gnu.org>, <libstdc++@gcc.gnu.org>

I'm seeing tr2/headers/all.cc fail in the libstdc++ testsuite:

In file included from
src/gcc-mainline/libstdc++-v3/testsuite/tr2/headers/all.cc:22:0:
/scratch/jseymour/mainline/i686-pc-linux-gnu/install/opt/codesourcery/include/c++/4.8.0/tr2/dynamic_bitset:42:27:
fatal error: cxxabi_forced.h: No such file or directory
 #include <cxxabi_forced.h>
                           ^
compilation terminated.


>From libstdc++-v3/libsupc++/Makefile.am:
> bits_HEADERS = \
>        atomic_lockfree_defines.h cxxabi_forced.h \
>        exception_defines.h exception_ptr.h hash_bytes.h nested_exception.h

Looking at how other headers in that list are treated, I believe it is the
include of cxxabi_forced.h in dynamic_bitset at fault. This patch corrects it.

I don't have commit access, so if this is acceptable perhaps someone would be
kind enough to commit it.

Thanks,

2012-10-06  Joe Seymour  <jseymour@codesourcery.com>

	* include/tr2/dynamic_bitset (cxxabi_forced.h): Fix include.


Index: libstdc++-v3/include/tr2/dynamic_bitset
===================================================================
--- libstdc++-v3/include/tr2/dynamic_bitset     (revision 192151)
+++ libstdc++-v3/include/tr2/dynamic_bitset     (working copy)
@@ -39,7 +39,7 @@
 #include <bits/functexcept.h>   // For invalid_argument, out_of_range,
                                // overflow_error
 #include <iosfwd>
-#include <cxxabi_forced.h>
+#include <bits/cxxabi_forced.h>

 namespace std _GLIBCXX_VISIBILITY(default)
 {