From 9a047b9f8dbb685df2b0f5d866d0c63ace9d23b3 Mon Sep 17 00:00:00 2001
From: Steffen Schuemann <s.schuemann@pobox.com>
Date: Wed, 8 Apr 2020 10:44:54 +0200
Subject: [PATCH] Updated readme, added error handling for conflicting options.

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

diff --git a/README.md b/README.md
index 00ba1ce..13fc557 100644
--- a/README.md
+++ b/README.md
@@ -487,6 +487,16 @@ to the expected behavior.
 
 ## Release Notes
 
+### v1.3.3 (wip)
+
+* Pull request [#62](https://github.com/gulrak/filesystem/pull/62), various fixes for
+  better Android support, thanks for the PR
+* Pull request [#61](https://github.com/gulrak/filesystem/pull/61), `ghc::filesystem` now
+  supports use in projects with disabled exceptions. API signatures using exceptions for
+  error handling are not available in this mode, thanks for the PR (this resolves
+  [#60](https://github.com/gulrak/filesystem/issues/60) and
+  [#43](https://github.com/gulrak/filesystem/issues/43))
+  
 ### [v1.3.2](https://github.com/gulrak/filesystem/releases/tag/v1.3.2)
 
 * Bugfix for [#58](https://github.com/gulrak/filesystem/issues/58), on MinGW the
diff --git a/include/ghc/filesystem.hpp b/include/ghc/filesystem.hpp
index a0d04f6..9cbde6d 100644
--- a/include/ghc/filesystem.hpp
+++ b/include/ghc/filesystem.hpp
@@ -193,6 +193,9 @@
 #if !defined(GHC_WITH_EXCEPTIONS) && (defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND))
 #define GHC_WITH_EXCEPTIONS
 #endif
+#if !defined(GHC_WITH_EXCEPTIONS) && defined(GHC_RAISE_UNICODE_ERRORS)
+#error "Can't raise unicode errors whith exception support disabled"
+#endif
 
 namespace ghc {
 namespace filesystem {