From 1da2158ed1b67ab855e02517d2093f30bfc3dec3 Mon Sep 17 00:00:00 2001
From: Steffen Schuemann <s.schuemann@pobox.com>
Date: Thu, 15 Aug 2019 14:56:11 +0200
Subject: [PATCH] Version bump to wip version, updated readme, some cleanup on
 defines.

---
 README.md                  | 10 ++++++++++
 include/ghc/filesystem.hpp | 16 +++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 469e254..f4a5cde 100644
--- a/README.md
+++ b/README.md
@@ -472,6 +472,16 @@ to the expected behavior.
 
 ## Release Notes
 
+### v1.2.5 (wip)
+
+* Pull request [#23](https://github.com/gulrak/filesystem/pull/23), tests and
+  examples can now be disabled in CMake via seting `BUILD_TESTING` and
+  `BUILD_EXAMPLES` to `NO`, `OFF` or `FALSE`.
+* Pull request [#25](https://github.com/gulrak/filesystem/pull/25),
+  missing specialization for construction from `std::string_view` when
+  available was added.
+* Additional test case when `std::string_view` is available.
+
 ### [v1.2.4](https://github.com/gulrak/filesystem/releases/tag/v1.2.4)
 
 * Enabled stronger warning switches and resulting fixed issues on GCC and MinGW
diff --git a/include/ghc/filesystem.hpp b/include/ghc/filesystem.hpp
index 2d1f826..3a2bbe7 100644
--- a/include/ghc/filesystem.hpp
+++ b/include/ghc/filesystem.hpp
@@ -48,10 +48,14 @@
 #ifndef GHC_FILESYSTEM_H
 #define GHC_FILESYSTEM_H
 
+#ifndef GHC_OS_DETECTED
 #if defined(__APPLE__) && defined(__MACH__)
 #define GHC_OS_MACOS
 #elif defined(__linux__)
 #define GHC_OS_LINUX
+#if defined(__ANDROID__)
+#define GHC_OS_ANDROID
+#endif
 #elif defined(_WIN64)
 #define GHC_OS_WINDOWS
 #define GHC_OS_WIN64
@@ -61,6 +65,8 @@
 #else
 #error "Operating system currently not supported!"
 #endif
+#define GHC_OS_DETECTED
+#endif
 
 #if defined(GHC_FILESYSTEM_IMPLEMENTATION)
 #define GHC_EXPAND_IMPL
@@ -108,8 +114,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
-#if defined(__ANDROID__)
-#define GHC_OS_ANDROID
+#ifdef GHC_OS_ANDROID
 #include <android/api-level.h>
 #endif
 #endif
@@ -172,7 +177,7 @@
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 // ghc::filesystem version in decimal (major * 10000 + minor * 100 + patch)
-#define GHC_FILESYSTEM_VERSION 10204L
+#define GHC_FILESYSTEM_VERSION 10205L
 
 namespace ghc {
 namespace filesystem {
@@ -5126,4 +5131,9 @@ GHC_INLINE recursive_directory_iterator end(const recursive_directory_iterator&)
 }  // namespace filesystem
 }  // namespace ghc
 
+// cleanup some macros
+#undef GHC_INLINE
+#undef GHC_EXPAND_IMPL
+#undef GHC_USE_WCHAR_T
+
 #endif  // GHC_FILESYSTEM_H