GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-07-23 23:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some warnings and a CMakeLists issue on Windows.

Browse Source
This commit is contained in:
Steffen Schümann 2018-09-29 13:51:12 +02:00
parent 1da3ae7864
commit b86f941c67
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/CMakeLists.txt
View File

@ -1,5 +1,6 @@
add_executable(fs_dir dir.cpp ../filesystem.h) add_executable(fs_dir dir.cpp ../filesystem.h)
target_compile_definitions(fs_dir PRIVATE _CRT_SECURE_NO_WARNINGS)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 7.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 7.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0))
add_executable(std_fs_dir dir.cpp) add_executable(std_fs_dir dir.cpp)
@ -14,4 +15,7 @@ endif()
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 19.15 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.15)) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 19.15 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.15))
add_executable(std_fs_dir dir.cpp) add_executable(std_fs_dir dir.cpp)
set_property(TARGET std_fs_dir PROPERTY CXX_STANDARD 17) set_property(TARGET std_fs_dir PROPERTY CXX_STANDARD 17)
set_property(TARGET std_fs_dir PROPERTY CXX_STANDARD_REQUIRED ON)
target_compile_options(std_fs_dir PRIVATE "/Zc:__cplusplus")
target_compile_definitions(std_fs_dir PRIVATE _CRT_SECURE_NO_WARNINGS)
endif() endif()

40
filesystem.h
View File

@ -345,9 +345,15 @@ private:
path _p1, _p2; path _p1, _p2;
}; };
class path::iterator : public std::iterator<std::bidirectional_iterator_tag, iterator> class path::iterator
{ {
public: public:
using value_type = const path;
using difference_type = std::ptrdiff_t;
using pointer = const path*;
using reference = const path&;
using iterator_category = std::bidirectional_iterator_tag;
iterator(); iterator();
iterator(const string_type::const_iterator& first, const string_type::const_iterator& last, const string_type::const_iterator& pos); iterator(const string_type::const_iterator& first, const string_type::const_iterator& last, const string_type::const_iterator& pos);
iterator& operator++(); iterator& operator++();
@ -356,8 +362,8 @@ public:
iterator operator--(int); iterator operator--(int);
bool operator==(const iterator& other) const; bool operator==(const iterator& other) const;
bool operator!=(const iterator& other) const; bool operator!=(const iterator& other) const;
const path& operator*() const; const reference operator*() const;
const path* operator->() const; const pointer operator->() const;
private: private:
string_type::const_iterator increment(const std::string::const_iterator& pos) const; string_type::const_iterator increment(const std::string::const_iterator& pos) const;
@ -900,8 +906,9 @@ typedef basic_ofstream<char> ofstream;
typedef basic_ofstream<wchar_t> wofstream; typedef basic_ofstream<wchar_t> wofstream;
typedef basic_fstream<char> fstream; typedef basic_fstream<char> fstream;
typedef basic_fstream<wchar_t> wfstream; typedef basic_fstream<wchar_t> wfstream;
class u8arguments { class u8arguments
{
public: public:
u8arguments(int& argc, char**& argv); u8arguments(int& argc, char**& argv);
~u8arguments() ~u8arguments()
@ -909,6 +916,7 @@ public:
_refargc = _argc; _refargc = _argc;
_refargv = _argv; _refargv = _argv;
} }
private: private:
int _argc; int _argc;
char** _argv; char** _argv;
@ -920,7 +928,6 @@ private:
#endif #endif
}; };
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// Implementation // Implementation
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
@ -1073,13 +1080,8 @@ inline void appendUTF8(std::string& str, uint32_t unicode)
// Generating debugging and shrinking my own DFA from scratch was a day of fun! // Generating debugging and shrinking my own DFA from scratch was a day of fun!
enum utf8_states_t { S_STRT = 0, S_RJCT = 8 }; enum utf8_states_t { S_STRT = 0, S_RJCT = 8 };
static const uint32_t utf8_state_info[] = { static const uint32_t utf8_state_info[] = {
0x11111111u, 0x11111111u, 0x77777777u, 0x77777777u, 0x11111111u, 0x11111111u, 0x77777777u, 0x77777777u, 0x88888888u, 0x88888888u, 0x88888888u, 0x88888888u, 0x22222299u, 0x22222222u, 0x22222222u, 0x22222222u, 0x3333333au, 0x33433333u,
0x88888888u, 0x88888888u, 0x88888888u, 0x88888888u, 0x9995666bu, 0x99999999u, 0x88888880u, 0x22818108u, 0x88888881u, 0x88888882u, 0x88888884u, 0x88888887u, 0x88888886u, 0x82218108u, 0x82281108u, 0x88888888u, 0x88888883u, 0x88888885u,
0x22222299u, 0x22222222u, 0x22222222u, 0x22222222u,
0x3333333au, 0x33433333u, 0x9995666bu, 0x99999999u,
0x88888880u, 0x22818108u, 0x88888881u, 0x88888882u,
0x88888884u, 0x88888887u, 0x88888886u, 0x82218108u,
0x82281108u, 0x88888888u, 0x88888883u, 0x88888885u,
}; };
static inline unsigned consumeUtf8Fragment(const unsigned state, const uint8_t fragment, uint32_t& codepoint) static inline unsigned consumeUtf8Fragment(const unsigned state, const uint8_t fragment, uint32_t& codepoint)
{ {
@ -1202,10 +1204,10 @@ inline void postprocess_path_with_format(path::string_type& p, path::format fmt)
} // namespace detail } // namespace detail
inline u8arguments::u8arguments(int& argc, char**& argv) inline u8arguments::u8arguments(int& argc, char**& argv)
: _argc(argc) : _argc(argc)
, _argv(argv) , _argv(argv)
, _refargc(argc) , _refargc(argc)
, _refargv(argv) , _refargv(argv)
{ {
#ifdef GHC_OS_WINDOWS #ifdef GHC_OS_WINDOWS
LPWSTR* p; LPWSTR* p;
@ -2418,12 +2420,12 @@ inline bool path::iterator::operator!=(const path::iterator& other) const
return _iter != other._iter; return _iter != other._iter;
} }
inline const path& path::iterator::operator*() const inline const path::iterator::reference path::iterator::operator*() const
{ {
return _current; return _current;
} }
inline const path* path::iterator::operator->() const inline const path::iterator::pointer path::iterator::operator->() const
{ {
return &_current; return &_current;
} }

1
test/CMakeLists.txt
View File

@ -23,5 +23,6 @@ endif()
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 19.15 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.15)) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 19.15 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.15))
add_executable(std_filesystem_test filesystem_test.cpp ../filesystem.h catch.hpp) add_executable(std_filesystem_test filesystem_test.cpp ../filesystem.h catch.hpp)
set_property(TARGET std_filesystem_test PROPERTY CXX_STANDARD 17) set_property(TARGET std_filesystem_test PROPERTY CXX_STANDARD 17)
target_compile_options(std_filesystem_test PRIVATE "/Zc:__cplusplus")
target_compile_definitions(std_filesystem_test PRIVATE USE_STD_FS) target_compile_definitions(std_filesystem_test PRIVATE USE_STD_FS)
endif() endif()