From 9f5391ee9521e90d0f3b545893d9d4b3d98839d1 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 8 Jan 2019 13:25:19 +0000
Subject: [PATCH] PR libstdc++/88066 use <> for includes not ""

Using #include "..." to include a header in the same directory fails if
the user compiles with -I-, so always use something like <bits/...> for
internal headers.

I haven't added tests for this, because dg-options adds options to the
end, and the position of -I- matters (if it's at the end then the tests
won't find any headers in the build tree, as they're specified by -I
options earlier in the flags). It's been manually tested though.

	PR libstdc++/88066
	* include/bits/locale_conv.h: Use <> for includes not "".
	* include/ext/random: Likewise.
	* include/ext/vstring.h: Likewise.

From-SVN: r267726
---
 libstdc++-v3/ChangeLog                  | 7 +++++++
 libstdc++-v3/include/bits/locale_conv.h | 8 ++++----
 libstdc++-v3/include/ext/random         | 4 ++--
 libstdc++-v3/include/ext/vstring.h      | 2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 84fb8d7d045..3adec7cc818 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2019-01-08  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/88066
+	* include/bits/locale_conv.h: Use <> for includes not "".
+	* include/ext/random: Likewise.
+	* include/ext/vstring.h: Likewise.
+
 2019-01-08  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* config/abi/pre/gnu.ver (GLIBCXX_3.4): Tighten existing patterns.
diff --git a/libstdc++-v3/include/bits/locale_conv.h b/libstdc++-v3/include/bits/locale_conv.h
index 3dffdc4d1b1..8438fedb516 100644
--- a/libstdc++-v3/include/bits/locale_conv.h
+++ b/libstdc++-v3/include/bits/locale_conv.h
@@ -35,10 +35,10 @@
 #else
 
 #include <streambuf>
-#include "stringfwd.h"
-#include "allocator.h"
-#include "codecvt.h"
-#include "unique_ptr.h"
+#include <bits/stringfwd.h>
+#include <bits/allocator.h>
+#include <bits/codecvt.h>
+#include <bits/unique_ptr.h>
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
diff --git a/libstdc++-v3/include/ext/random b/libstdc++-v3/include/ext/random
index 91c5a296a79..41a2962c8f6 100644
--- a/libstdc++-v3/include/ext/random
+++ b/libstdc++-v3/include/ext/random
@@ -3857,8 +3857,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace __gnu_cxx
 
-#include "ext/opt_random.h"
-#include "random.tcc"
+#include <ext/opt_random.h>
+#include <ext/random.tcc>
 
 #endif // _GLIBCXX_USE_C99_STDINT_TR1 && UINT32_C
 
diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h
index d83ba02fc1a..ddffebf0893 100644
--- a/libstdc++-v3/include/ext/vstring.h
+++ b/libstdc++-v3/include/ext/vstring.h
@@ -2960,6 +2960,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
 
 #endif // C++11
 
-#include "vstring.tcc" 
+#include <ext/vstring.tcc>
 
 #endif /* _VSTRING_H */
-- 
2.30.2