From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 13 Oct 2016 16:41:10 +0000 (+0100)
Subject: Qualify use of std::declval to avoid ADL
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=10482a65989967be8b4a6a85114fcebc5e786f7d;p=gcc.git

Qualify use of std::declval to avoid ADL

	* include/experimental/propagate_const (element_type): Qualify
	declval.

From-SVN: r241129
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 111bf5241e9..bfaeb703223 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2016-10-13  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/experimental/propagate_const (element_type): Qualify
+	declval.
+
 	* testsuite/26_numerics/random/default_random_engine.cc: Use VERIFY
 	instead of assert.
 
diff --git a/libstdc++-v3/include/experimental/propagate_const b/libstdc++-v3/include/experimental/propagate_const
index 15ffe4ac6ad..e1fb4e49198 100644
--- a/libstdc++-v3/include/experimental/propagate_const
+++ b/libstdc++-v3/include/experimental/propagate_const
@@ -63,7 +63,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     class propagate_const
     {
     public:
-      typedef remove_reference_t<decltype(*declval<_Tp&>())> element_type;
+      typedef remove_reference_t<decltype(*std::declval<_Tp&>())> element_type;
 
     private:
       template <typename _Up>