Skip to content

Commit

Permalink
Minor updates to syntax (#96)
Browse files Browse the repository at this point in the history
* Update editor.h

Otherwise, compiling with header-only gives:

`gui/zep/include/zep/editor.h:439:51: error: copying member subobject of type 'std::atomic<bool>' invokes deleted constructor
    mutable std::atomic<bool> m_bPendingRefresh = true;`

* Update filesystem.cpp

* Create app_config.h

* updated conditional filesystem sourcing syntax for apple
  • Loading branch information
jacobfriedman authored Feb 4, 2023
1 parent 64c74a5 commit 358db99
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions app_config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

2 changes: 1 addition & 1 deletion include/zep/editor.h
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ class ZepEditor
tBuffers m_buffers;
uint32_t m_flags = 0;

mutable std::atomic_bool m_bPendingRefresh = true;
mutable std::atomic_bool m_bPendingRefresh = { true };
mutable bool m_lastCursorBlink = false;

std::vector<std::string> m_commandLines; // Command information, shown under the buffer
Expand Down
7 changes: 6 additions & 1 deletion src/filesystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@
#if defined(ZEP_FEATURE_CPP_FILE_SYSTEM)

#include <filesystem>
namespace cpp_fs = std::filesystem;

#ifdef __APPLE__
namespace cpp_fs = std::__fs::filesystem;
#else
namespace cpp_fs = std::filesystem;
#endif

namespace Zep
{
Expand Down

0 comments on commit 358db99

Please sign in to comment.