From a7d6efc5201960b351fee4760663388dd946ab8e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 7 Aug 2018 13:31:57 -0400 Subject: common: Convert type traits templates over to variable template versions where applicable Uses the C++17 inline variable variants --- src/common/file_util.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/common/file_util.h') diff --git a/src/common/file_util.h b/src/common/file_util.h index 28697d527..7f2a5cb63 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -207,7 +207,7 @@ public: template size_t ReadArray(T* data, size_t length) const { - static_assert(std::is_trivially_copyable(), + static_assert(std::is_trivially_copyable_v, "Given array does not consist of trivially copyable objects"); if (!IsOpen()) @@ -218,7 +218,7 @@ public: template size_t WriteArray(const T* data, size_t length) { - static_assert(std::is_trivially_copyable(), + static_assert(std::is_trivially_copyable_v, "Given array does not consist of trivially copyable objects"); if (!IsOpen()) return -1; @@ -227,19 +227,19 @@ public: template size_t ReadBytes(T* data, size_t length) const { - static_assert(std::is_trivially_copyable(), "T must be trivially copyable"); + static_assert(std::is_trivially_copyable_v, "T must be trivially copyable"); return ReadArray(reinterpret_cast(data), length); } template size_t WriteBytes(const T* data, size_t length) { - static_assert(std::is_trivially_copyable(), "T must be trivially copyable"); + static_assert(std::is_trivially_copyable_v, "T must be trivially copyable"); return WriteArray(reinterpret_cast(data), length); } template size_t WriteObject(const T& object) { - static_assert(!std::is_pointer::value, "Given object is a pointer"); + static_assert(!std::is_pointer_v, "WriteObject arguments must not be a pointer"); return WriteArray(&object, 1); } -- cgit v1.2.3 From 3f82dad1e411130e309074a1547fb2104257f95d Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Fri, 3 Aug 2018 11:47:35 -0400 Subject: file_util: Add platform-specific slash option to SanitizePath --- src/common/file_util.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/common/file_util.h') diff --git a/src/common/file_util.h b/src/common/file_util.h index d0987fb57..ca63d7466 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -182,8 +182,9 @@ std::vector SliceVector(const std::vector& vector, size_t first, size_t la return std::vector(vector.begin() + first, vector.begin() + first + last); } -// Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'. -std::string SanitizePath(std::string_view path); +// Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'. Makes '/' into '\\' +// if windows and with_platform_slashes is true. +std::string SanitizePath(std::string_view path, bool with_platform_slashes = false); // simple wrapper for cstdlib file functions to // hopefully will make error checking easier -- cgit v1.2.3 From 2b6128fe0b8788318a4bbe1fc55ea14aed2981e4 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Mon, 6 Aug 2018 23:21:37 -0400 Subject: file_util: Use enum instead of bool for specifing path behavior --- src/common/file_util.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/common/file_util.h') diff --git a/src/common/file_util.h b/src/common/file_util.h index ca63d7466..2711872ae 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -182,9 +182,12 @@ std::vector SliceVector(const std::vector& vector, size_t first, size_t la return std::vector(vector.begin() + first, vector.begin() + first + last); } +enum class DirectorySeparator { ForwardSlash, BackwardSlash, PlatformDefault }; + // Removes trailing slash, makes all '\\' into '/', and removes duplicate '/'. Makes '/' into '\\' -// if windows and with_platform_slashes is true. -std::string SanitizePath(std::string_view path, bool with_platform_slashes = false); +// depending if directory_separator is BackwardSlash or PlatformDefault and running on windows +std::string SanitizePath(std::string_view path, + DirectorySeparator directory_separator = DirectorySeparator::ForwardSlash); // simple wrapper for cstdlib file functions to // hopefully will make error checking easier -- cgit v1.2.3