aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2015-05-01 22:26:24 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2015-05-01 22:26:24 +0100
commitb275f0cbe533fb0ebbc6f91b0cb0fb520be9a3dc (patch)
tree38d4bf4c097dd14fddde0e3ac68439a5145ed614
parent64b07900f168ccab6ba336033daa61b71c00887c (diff)
downloadgcc-b275f0cbe533fb0ebbc6f91b0cb0fb520be9a3dc.zip
gcc-b275f0cbe533fb0ebbc6f91b0cb0fb520be9a3dc.tar.gz
gcc-b275f0cbe533fb0ebbc6f91b0cb0fb520be9a3dc.tar.bz2
* include/experimental/memory: Correct feature-test macro.
From-SVN: r222708
-rw-r--r--libstdc++-v3/ChangeLog2
-rw-r--r--libstdc++-v3/include/experimental/memory2
2 files changed, 3 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e1aae80..b554c05 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,7 @@
2015-05-01 Jonathan Wakely <jwakely@redhat.com>
+ * include/experimental/memory: Correct feature-test macro.
+
* include/experimental/memory: Add feature-test macro.
* include/experimental/vector: Likewise.
* doc/xml/manual/status_cxx2017.xml: Update status.
diff --git a/libstdc++-v3/include/experimental/memory b/libstdc++-v3/include/experimental/memory
index f43621f..08a6b33 100644
--- a/libstdc++-v3/include/experimental/memory
+++ b/libstdc++-v3/include/experimental/memory
@@ -52,7 +52,7 @@ inline namespace fundamentals_v2
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
-#define __cpp_lib_experimental_not_fn 201411
+#define __cpp_lib_experimental_observer_ptr 201411
template <typename _Tp>
class observer_ptr