Skip to content

Commit 54d2ae1

Browse files
committed
Removed macro for explicitly requiring experimental optional and updated README to reflect the change
1 parent 9475782 commit 54d2ae1

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ int main() {
325325
326326
If you do not have C++17 support, you can use boost optional instead by defining `_MODERN_SQLITE_BOOST_OPTIONAL_SUPPORT` before importing the `sqlite_modern_cpp` header.
327327
328-
If your compiler does support C++17, but does not have optional (macOS for instance, at the time this was written), you can use std::experimental::optional instead by defining `_MODERN_SQLITE_EXPERIMENTAL_OPTIONAL_SUPPORT` before importing the `sqlite_modern_cpp` header.
328+
If the optional library is not available, the experimental/optional one will be used instead.
329329
330330
**Note: boost support is deprecated and will be removed in future versions.**
331331

hdr/sqlite_modern_cpp.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717
#if __cplusplus > 201402 && __has_include(<optional>)
1818
#define MODERN_SQLITE_STD_OPTIONAL_SUPPORT
1919
#elif __has_include(<experimental/optional>)
20-
#ifdef _MODERN_SQLITE_EXPERIMENTAL_OPTIONAL_SUPPORT
2120
#define MODERN_SQLITE_EXPERIMENTAL_OPTIONAL_SUPPORT
2221
#endif
2322
#endif
24-
#endif
2523

2624
#ifdef __has_include
2725
#if __cplusplus > 201402 && __has_include(<variant>)

0 commit comments

Comments
 (0)