Skip to content
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

Jump to bottom

Update yaml-cpp to version 0.7 #10961

Merged
merged 3 commits into from Oct 5, 2021
Merged

Update yaml-cpp to version 0.7 #10961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2da3d74
Fix config mode reset
Megamouse Oct 5, 2021
be99fd5
Add missing cpu_flag formatting
Megamouse Oct 5, 2021
e9e717b
Update yaml-cpp
Megamouse Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/yaml-cpp/yaml-cpp
Open in desktop
Submodule yaml-cpp updated 460 files
1 change: 1 addition & 0 deletions 3rdparty/yaml-cpp/yaml-cpp.vcxproj
View file
Open in desktop
Expand Up @@ -52,6 +52,7 @@
</ClCompile>
<ClCompile Include="yaml-cpp\src\convert.cpp">
</ClCompile>
<ClCompile Include="yaml-cpp\src\depthguard.cpp" />
<ClCompile Include="yaml-cpp\src\directives.cpp">
</ClCompile>
<ClCompile Include="yaml-cpp\src\emit.cpp">
Expand Down
3 changes: 3 additions & 0 deletions 3rdparty/yaml-cpp/yaml-cpp.vcxproj.filters
View file
Open in desktop
Expand Up @@ -91,5 +91,8 @@
<ClCompile Include="yaml-cpp\src\exceptions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="yaml-cpp\src\depthguard.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Utilities/Thread.h
View file
Open in desktop
Expand Up @@ -156,7 +156,7 @@ class thread_base
static void set_name(std::string);

// Make entry point
static native_entry make_trampoline(u64(*)(thread_base*));
static native_entry make_trampoline(u64(*entry)(thread_base* _base));

friend class thread_ctrl;

Expand Down
1 change: 1 addition & 0 deletions rpcs3/Emu/CPU/CPUThread.cpp
View file
Open in desktop
Expand Up @@ -49,6 +49,7 @@ void fmt_class_string<cpu_flag>::format(std::string& out, u64 arg)
case cpu_flag::ret: return "ret";
case cpu_flag::signal: return "sig";
case cpu_flag::memory: return "mem";
case cpu_flag::pending: return "pend";
case cpu_flag::dbg_global_pause: return "G-PAUSE";
case cpu_flag::dbg_pause: return "PAUSE";
case cpu_flag::dbg_step: return "STEP";
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/System.cpp
View file
Open in desktop
Expand Up @@ -1776,7 +1776,7 @@ void Emulator::Stop(bool restart)
klic.clear();
hdd1.clear();
m_config_path.clear();
m_config_mode == cfg_mode::custom;
m_config_mode = cfg_mode::custom;

// Always Enable display sleep, not only if it was prevented.
enable_display_sleep();
Expand Down