Merge branch 'master' into HarmonyPlatform

Author: robertosfield

INSTALL.md

@@ -20,7 +20,7 @@
 
 * C++17 compliant compiler i.e. g++ 7.3 or later, Clang 6.0 or later, Visual Studio S2017 or later.
 * [Vulkan](https://vulkan.lunarg.com/) 1.1 or later.  You can use Vulkan (libs and headers) installed from repositories or VulkanSDK.
-* [CMake](https://www.cmake.org) 3.7 or later.
+* [CMake](https://www.cmake.org) 3.10 or later.
 
 ---
 
@@ -180,7 +180,7 @@ This will also tell CMake that your minimum C++ standard is 17.
 
 For example, a bare minimum CMakeLists.txt file to compile a single file application would be:
 
-	cmake_minimum_required(VERSION 3.7)
+	cmake_minimum_required(VERSION 3.10)
 	find_package(vsg REQUIRED)
 	add_executable(myapp "myapp.cpp")
 	target_link_libraries(myapp vsg::vsg)
@@ -191,7 +191,7 @@ The build system provides macros that create specific cmake targets to use in yo
 
 For example, a bare minimum CMakeLists.txt file adding the mentioned cmake targets would be:
 
-	cmake_minimum_required(VERSION 3.7)
+	cmake_minimum_required(VERSION 3.10)
 	find_package(vsg REQUIRED)
 
 	vsg_setup_dir_vars()

include/vsg/io/convert_utf.h

@@ -28,10 +28,19 @@ namespace vsg
     inline void convert_utf(const std::string& src, std::string& dst) { dst = src; }
     inline void convert_utf(const std::wstring& src, std::wstring& dst) { dst = src; }
 
-    #if defined(__cpp_char8_t)
+#if defined(__cpp_char8_t)
     inline void convert_utf(const std::u8string& src, std::u8string& dst) { dst = src; }
-    inline void convert_utf(const std::wstring& src, std::u8string& dst) { std::string temp_dst; convert_utf(src, temp_dst); dst.assign(temp_dst.begin(), temp_dst.end()); }
-    inline void convert_utf(const std::u8string& src, std::wstring& dst) { std::string temp_src(src.begin(), src.end()); convert_utf(temp_src, dst); }
+    inline void convert_utf(const std::wstring& src, std::u8string& dst)
+    {
+        std::string temp_dst;
+        convert_utf(src, temp_dst);
+        dst.assign(temp_dst.begin(), temp_dst.end());
+    }
+    inline void convert_utf(const std::u8string& src, std::wstring& dst)
+    {
+        std::string temp_src(src.begin(), src.end());
+        convert_utf(temp_src, dst);
+    }
 
     inline void convert_utf(const char8_t c, std::u8string& dst)
     {
@@ -56,7 +65,7 @@ namespace vsg
         convert_utf(src, dst);
         return dst;
     }
-    #endif
+#endif
 
     inline void convert_utf(const char c, std::string& dst)
     {