GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-06-04 11:13:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Version bump to wip version, updated readme, some cleanup on defines.

Browse Source
This commit is contained in:
Steffen Schuemann 2019-08-15 14:56:11 +02:00
parent 79fb211570
commit 1da2158ed1
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -472,6 +472,16 @@ to the expected behavior.
## Release Notes ## 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) ### [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 * Enabled stronger warning switches and resulting fixed issues on GCC and MinGW

16
include/ghc/filesystem.hpp
View File

@ -48,10 +48,14 @@
#ifndef GHC_FILESYSTEM_H #ifndef GHC_FILESYSTEM_H
#define GHC_FILESYSTEM_H #define GHC_FILESYSTEM_H
#ifndef GHC_OS_DETECTED
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
#define GHC_OS_MACOS #define GHC_OS_MACOS
#elif defined(__linux__) #elif defined(__linux__)
#define GHC_OS_LINUX #define GHC_OS_LINUX
#if defined(__ANDROID__)
#define GHC_OS_ANDROID
#endif
#elif defined(_WIN64) #elif defined(_WIN64)
#define GHC_OS_WINDOWS #define GHC_OS_WINDOWS
#define GHC_OS_WIN64 #define GHC_OS_WIN64
@ -61,6 +65,8 @@
#else #else
#error "Operating system currently not supported!" #error "Operating system currently not supported!"
#endif #endif
#define GHC_OS_DETECTED
#endif
#if defined(GHC_FILESYSTEM_IMPLEMENTATION) #if defined(GHC_FILESYSTEM_IMPLEMENTATION)
#define GHC_EXPAND_IMPL #define GHC_EXPAND_IMPL
@ -108,8 +114,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#if defined(__ANDROID__) #ifdef GHC_OS_ANDROID
#define GHC_OS_ANDROID
#include <android/api-level.h> #include <android/api-level.h>
#endif #endif
#endif #endif
@ -172,7 +177,7 @@
//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// ghc::filesystem version in decimal (major * 10000 + minor * 100 + patch) // ghc::filesystem version in decimal (major * 10000 + minor * 100 + patch)
#define GHC_FILESYSTEM_VERSION 10204L #define GHC_FILESYSTEM_VERSION 10205L
namespace ghc { namespace ghc {
namespace filesystem { namespace filesystem {
@ -5126,4 +5131,9 @@ GHC_INLINE recursive_directory_iterator end(const recursive_directory_iterator&)
} // namespace filesystem } // namespace filesystem
} // namespace ghc } // namespace ghc
// cleanup some macros
#undef GHC_INLINE
#undef GHC_EXPAND_IMPL
#undef GHC_USE_WCHAR_T
#endif // GHC_FILESYSTEM_H #endif // GHC_FILESYSTEM_H