From 9a6a406fa25a8811451522649dcaaf0ef5adb0a1 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Thu, 17 Nov 2016 18:07:57 +1100 Subject: [PATCH] build: use path objects over c_str calls --- json/schema.cpp | 2 +- json/tree.cpp | 2 +- library_win32.cpp | 2 +- library_win32.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/json/schema.cpp b/json/schema.cpp index 0ec5165a..172c1de6 100644 --- a/json/schema.cpp +++ b/json/schema.cpp @@ -533,7 +533,7 @@ void json::schema::validate (json::tree::node &data, const std::experimental::filesystem::path &schema_path) { - const util::mapped_file schema_data (schema_path.string ().c_str ()); + const util::mapped_file schema_data (schema_path); auto schema_object = json::tree::parse (schema_data.as_view ()); validate (data, schema_object->as_object ()); } diff --git a/json/tree.cpp b/json/tree.cpp index a4069a8a..f650b28b 100644 --- a/json/tree.cpp +++ b/json/tree.cpp @@ -241,7 +241,7 @@ MAP( std::unique_ptr json::tree::parse (const std::experimental::filesystem::path &src) { - const util::mapped_file data (src.string ().c_str ()); + const util::mapped_file data (src); return parse (data.as_view ()); } diff --git a/library_win32.cpp b/library_win32.cpp index 2ef1c03d..7397f8b3 100644 --- a/library_win32.cpp +++ b/library_win32.cpp @@ -22,7 +22,7 @@ using util::detail::win32::library; /////////////////////////////////////////////////////////////////////////////// -library::library (const std::experimental::filesystem::path &path) +library::library (const std::experimental::filesystem::path &path): m_handle (LoadLibraryA (path.c_str ())) { if (!m_handle) diff --git a/library_win32.hpp b/library_win32.hpp index dd744caa..25226c68 100644 --- a/library_win32.hpp +++ b/library_win32.hpp @@ -25,7 +25,7 @@ namespace util { namespace detail { namespace win32 { class library { public: - library (const std::experimenal::filesystem::path&); + library (const std::experimental::filesystem::path&); ~library (); void* symbol (const char *name);