Skip to content

Commit 8d49a12

Browse files
committed
Fix prevention to construct, convert from nullptr for presence of =delete, p2166 (#47)
1 parent 6c2ba86 commit 8d49a12

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

include/nonstd/string_view.hpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@ using std::operator<<;
288288
#define nssv_HAVE_CONSTEXPR_11 nssv_CPP11_140
289289
#define nssv_HAVE_EXPLICIT_CONVERSION nssv_CPP11_140
290290
#define nssv_HAVE_INLINE_NAMESPACE nssv_CPP11_140
291+
#define nssv_HAVE_IS_DEFAULT nssv_CPP11_140
292+
#define nssv_HAVE_IS_DELETE nssv_CPP11_140
291293
#define nssv_HAVE_NOEXCEPT nssv_CPP11_140
292294
#define nssv_HAVE_NULLPTR nssv_CPP11_100
293295
#define nssv_HAVE_REF_QUALIFIER nssv_CPP11_140
@@ -607,8 +609,12 @@ class basic_string_view
607609
#endif
608610
{}
609611

610-
#if nssv_HAVE_NULLPTR
612+
#if nssv_HAVE_NULLPTR
613+
# if nssv_HAVE_IS_DELETE
611614
nssv_constexpr basic_string_view( std::nullptr_t ) nssv_noexcept = delete;
615+
# else
616+
private: nssv_constexpr basic_string_view( std::nullptr_t ) nssv_noexcept; public:
617+
# endif
612618
#endif
613619

614620
// Assignment:

0 commit comments

Comments
 (0)