mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-02-07 17:08:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Manage memory with higher level constructs

Browse Source
This commit is contained in:
Chris Thrasher 2023-10-22 23:37:02 -05:00
parent 5cf740fd93
commit 13dd9f59cf
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SFML/Main/MainAndroid.cpp
View File

@ -500,9 +500,9 @@ JNIEXPORT void ANativeActivity_onCreate(ANativeActivity* activity, void* savedSt
if (savedState != nullptr) if (savedState != nullptr)
{ {
states->savedState = std::malloc(savedStateSize); const auto* begin = static_cast<const std::byte*>(savedState);
states->savedStateSize = savedStateSize; const auto* end = begin + savedStateSize;
std::memcpy(states->savedState, savedState, savedStateSize); states->savedState.assign(begin, end);
} }
states->mainOver = false; states->mainOver = false;

5
src/SFML/System/Android/Activity.hpp
View File

@ -39,6 +39,8 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <cstddef>
class SFML_SYSTEM_API LogcatStream : public std::streambuf class SFML_SYSTEM_API LogcatStream : public std::streambuf
{ {
public: public:
@ -64,8 +66,7 @@ struct ActivityStates
EGLDisplay display{}; EGLDisplay display{};
EglContext* context{}; EglContext* context{};
void* savedState{}; std::vector<std::byte> savedState;
std::size_t savedStateSize{};
std::recursive_mutex mutex; std::recursive_mutex mutex;