diff options
| author | Mat M <mathew1800@gmail.com> | 2016-09-25 16:53:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-25 16:53:46 -0400 |
| commit | e7efbf7ae58b27266daa62e4ccae6b6ce2b48fa2 (patch) | |
| tree | 55ff67a7a76144406d84aa95142210e6978937fe /Source/Core/Common | |
| parent | a1486d48efecf7cb4b3f6daff4bdbb0b5c822a31 (diff) | |
| parent | 349b27199b178fd2fb73727617ac86109c53f7aa (diff) | |
Merge pull request #4246 from leoetlino/in-class-init
In-class initialise member variables
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/MemoryUtil.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/Common/MemoryUtil.h | 1 | ||||
| -rw-r--r-- | Source/Core/Common/SysConf.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Common/SysConf.h | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index ce0d38cbcb..0c079a15b3 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -33,7 +33,6 @@ namespace Common { - #if !defined(_WIN32) #include <unistd.h> static uintptr_t RoundPage(uintptr_t addr) diff --git a/Source/Core/Common/MemoryUtil.h b/Source/Core/Common/MemoryUtil.h index fa41da297c..1e2402f5d2 100644 --- a/Source/Core/Common/MemoryUtil.h +++ b/Source/Core/Common/MemoryUtil.h @@ -9,7 +9,6 @@ namespace Common { - void* AllocateExecutableMemory(size_t size, bool low = true); void* AllocateMemoryPages(size_t size); void FreeMemoryPages(void* ptr, size_t size); diff --git a/Source/Core/Common/SysConf.cpp b/Source/Core/Common/SysConf.cpp index d6aed4f29e..980318c06b 100644 --- a/Source/Core/Common/SysConf.cpp +++ b/Source/Core/Common/SysConf.cpp @@ -17,7 +17,7 @@ #include "Core/Movie.h" -SysConf::SysConf() : m_IsValid(false) +SysConf::SysConf() { UpdateLocation(); } diff --git a/Source/Core/Common/SysConf.h b/Source/Core/Common/SysConf.h index 83bed95a4f..e500267c53 100644 --- a/Source/Core/Common/SysConf.h +++ b/Source/Core/Common/SysConf.h @@ -182,5 +182,5 @@ private: std::string m_Filename; std::string m_FilenameDefault; std::vector<SSysConfEntry> m_Entries; - bool m_IsValid; + bool m_IsValid = false; }; |
