From 6b10cb1067240fff229cf5febbe81c5e4c8cd7a5 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 6 Dec 2020 18:48:17 +0000
Subject: Put some C++20 in LazyPointer

---
 libadhocutil/lazyPointer.h         |  4 ++++
 libadhocutil/unittests/Jamfile.jam | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/libadhocutil/lazyPointer.h b/libadhocutil/lazyPointer.h
index 70fe61d..8b523d3 100644
--- a/libadhocutil/lazyPointer.h
+++ b/libadhocutil/lazyPointer.h
@@ -58,7 +58,11 @@ namespace AdHoc {
 		[[nodiscard]] T *
 		get() const
 		{
+#if __cpp_lib_to_address
+			return std::to_address(deref());
+#else
 			return &*deref();
+#endif
 		}
 
 		[[nodiscard]] const P &
diff --git a/libadhocutil/unittests/Jamfile.jam b/libadhocutil/unittests/Jamfile.jam
index f91579a..5ca476d 100644
--- a/libadhocutil/unittests/Jamfile.jam
+++ b/libadhocutil/unittests/Jamfile.jam
@@ -160,6 +160,18 @@ run
 	testLazyPointer
 	;
 
+run
+	testLazyPointer.cpp
+	: : :
+	<define>BOOST_TEST_DYN_LINK
+	<library>..//adhocutil
+	<library>boost_utf
+	<cxxstd>17
+	-<cxxstd>20
+	:
+	testLazyPointer17
+	;
+
 run
 	testNvpParse.cpp
 	: : :
-- 
cgit v1.2.3