aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2016-10-13 17:41:10 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2016-10-13 17:41:10 +0100
commit10482a65989967be8b4a6a85114fcebc5e786f7d (patch)
tree88f176885df933746d90a267b6bc856c365ea074
parentf49adbb8d8d0507e130ac2fcc709a6e7c0d29472 (diff)
downloadgcc-10482a65989967be8b4a6a85114fcebc5e786f7d.zip
gcc-10482a65989967be8b4a6a85114fcebc5e786f7d.tar.gz
gcc-10482a65989967be8b4a6a85114fcebc5e786f7d.tar.bz2
Qualify use of std::declval to avoid ADL
* include/experimental/propagate_const (element_type): Qualify declval. From-SVN: r241129
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/include/experimental/propagate_const2
2 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 111bf52..bfaeb70 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 15ffe4a..e1fb4e4 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>