mirror of
https://github.com/momo5502/emulator.git
synced 2026-01-23 05:31:03 +00:00
Merge remote-tracking branch 'origin/main' into multi-platform-support
# Conflicts: # src/analyzer/main.cpp # src/emulator/memory_region.hpp # src/windows-emulator/io_device.cpp # src/windows-emulator/module/module_mapping.cpp # src/windows-emulator/process_context.hpp # src/windows-emulator/syscalls.cpp # src/windows-emulator/windows_emulator.cpp
This commit is contained in:
@@ -20,10 +20,10 @@
|
||||
|
||||
namespace test
|
||||
{
|
||||
inline windows_emulator create_sample_emulator(emulator_settings& settings)
|
||||
inline windows_emulator create_sample_emulator(emulator_settings settings)
|
||||
{
|
||||
settings.application = "./test-sample.exe";
|
||||
return windows_emulator{settings};
|
||||
return windows_emulator{std::move(settings)};
|
||||
}
|
||||
|
||||
inline windows_emulator create_sample_emulator()
|
||||
@@ -34,6 +34,6 @@ namespace test
|
||||
.use_relative_time = true,
|
||||
};
|
||||
|
||||
return create_sample_emulator(settings);
|
||||
return create_sample_emulator(std::move(settings));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user