Skip to content

WIP: Consider C++17 string_view #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

WIP: Consider C++17 string_view #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions include/cxx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,34 @@
#include <type_traits>
#include <utility>

// CXX_HAVE_STD_STRING_VIEW
//
// Checks whether C++17 std::string_view is available.
#ifdef CXX_HAVE_STD_STRING_VIEW
#error "CXX_HAVE_STD_STRING_VIEW cannot be directly set."
#endif

#ifdef __has_include
#if __has_include(<string_view>) && __cplusplus >= 201703L
#define CXX_HAVE_STD_STRING_VIEW 1
#endif
#endif

// For MSVC, `__has_include` is supported in VS 2017 15.3, which is later than
// the support for <optional>, <any>, <string_view>, <variant>. So we use
// _MSC_VER to check whether we have VS 2017 RTM (when <optional>, <any>,
// <string_view>, <variant> is implemented) or higher. Also, `__cplusplus` is
// not correctly set by MSVC, so we use `_MSVC_LANG` to check the language
// version.
#if defined(_MSC_VER) && _MSC_VER >= 1910 && \
((defined(_MSVC_LANG) && _MSVC_LANG > 201402) || __cplusplus > 201402)
#define CXX_HAVE_STD_STRING_VIEW 1
#endif

#ifdef CXX_HAVE_STD_STRING_VIEW
#include <string_view>
#endif

namespace rust {
inline namespace cxxbridge02 {

Expand Down Expand Up @@ -50,8 +78,13 @@ class Str final {
Str() noexcept;
Str(const Str &) noexcept;

#ifdef CXX_HAVE_STD_STRING_VIEW
Str(std::string_view);
#else
Str(const std::string &);
Str(const char *);
#endif

Str(std::string &&) = delete;

Str &operator=(Str) noexcept;
Expand Down