aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2017-04-19 16:18:24 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2017-04-19 16:18:24 +0100
commit6a8446fa8b9353013e0342ca970d1d9cdf8c2ee9 (patch)
treef074895f3b1723b4ec7b304d28545ecf0571f7cd
parent8264e6c39c497349881ee2259451f8ba9f1b8cd9 (diff)
downloadgcc-6a8446fa8b9353013e0342ca970d1d9cdf8c2ee9.zip
gcc-6a8446fa8b9353013e0342ca970d1d9cdf8c2ee9.tar.gz
gcc-6a8446fa8b9353013e0342ca970d1d9cdf8c2ee9.tar.bz2
* libsupc++/new: Update comment on #endif directive.
From-SVN: r246999
-rw-r--r--libstdc++-v3/ChangeLog2
-rw-r--r--libstdc++-v3/libsupc++/new2
2 files changed, 3 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 01156a0..4d282ad 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,7 @@
2017-04-19 Jonathan Wakely <jwakely@redhat.com>
+ * libsupc++/new: Update comment on #endif directive.
+
PR libstdc++/80448
* include/experimental/bits/fs_dir.h (directory_iterator)
(recursive_directory_iterator): Remove noexcept from defaulted
diff --git a/libstdc++-v3/libsupc++/new b/libstdc++-v3/libsupc++/new
index 2de7752..04f172c 100644
--- a/libstdc++-v3/libsupc++/new
+++ b/libstdc++-v3/libsupc++/new
@@ -209,7 +209,7 @@ namespace std
void launder(volatile void*) = delete;
void launder(const volatile void*) = delete;
}
-#endif // _GLIBCXX_NO_BUILTIN_LAUNDER
+#endif // _GLIBCXX_HAVE_BUILTIN_LAUNDER
#undef _GLIBCXX_HAVE_BUILTIN_LAUNDER
#endif // C++17