Skip to content

Changed std::string to std::filesystem::path in the Filewatcher #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nepp95 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changed std::string to std::filesystem::path in the Filewatcher #603

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Hazel/src/Hazel/Scripting/ScriptEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ namespace Hazel {
std::unordered_map<UUID, Ref<ScriptInstance>> EntityInstances;
std::unordered_map<UUID, ScriptFieldMap> EntityScriptFields;

Scope<filewatch::FileWatch<std::string>> AppAssemblyFileWatcher;
Scope<filewatch::FileWatch<std::filesystem::path>> AppAssemblyFileWatcher;
bool AssemblyReloadPending = false;

bool EnableDebugging = true;
Expand All @@ -142,7 +142,7 @@ namespace Hazel {

static ScriptEngineData* s_Data = nullptr;

static void OnAppAssemblyFileSystemEvent(const std::string& path, const filewatch::Event change_type)
static void OnAppAssemblyFileSystemEvent(const std::filesystem::path& path, const filewatch::Event change_type)
{
if (!s_Data->AssemblyReloadPending && change_type == filewatch::Event::modified)
{
Expand Down Expand Up @@ -252,7 +252,7 @@ namespace Hazel {

s_Data->AppAssemblyImage = mono_assembly_get_image(s_Data->AppAssembly);

s_Data->AppAssemblyFileWatcher = CreateScope<filewatch::FileWatch<std::string>>(filepath.string(), OnAppAssemblyFileSystemEvent);
s_Data->AppAssemblyFileWatcher = CreateScope<filewatch::FileWatch<std::filesystem::path>>(filepath, OnAppAssemblyFileSystemEvent);
s_Data->AssemblyReloadPending = false;
return true;
}
Expand Down