MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump to C++17

Browse Source
This commit is contained in:
topjohnwu 2019-01-20 00:07:58 -05:00
parent 3e4c12cf56
commit a4f8bd4ee0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/Application.mk
View File

@ -1,7 +1,7 @@
APP_ABI := armeabi-v7a x86 APP_ABI := armeabi-v7a x86
APP_CFLAGS := -Oz -std=gnu11 \ APP_CFLAGS := -Oz -std=gnu11 \
-DMAGISK_VERSION="${MAGISK_VERSION}" -DMAGISK_VER_CODE=${MAGISK_VER_CODE} -DMAGISK_VERSION="${MAGISK_VERSION}" -DMAGISK_VER_CODE=${MAGISK_VER_CODE}
APP_CPPFLAGS := -std=c++14 APP_CPPFLAGS := -std=c++17
APP_STL := c++_static APP_STL := c++_static
APP_PLATFORM := android-16 APP_PLATFORM := android-16

8
native/jni/utils/new.cpp
View File

@ -8,7 +8,7 @@ void* operator new(std::size_t s) { return malloc(s); }
void* operator new[](std::size_t s) { return malloc(s); } void* operator new[](std::size_t s) { return malloc(s); }
void operator delete(void *p) { free(p); } void operator delete(void *p) { free(p); }
void operator delete[](void *p) { free(p); } void operator delete[](void *p) { free(p); }
void* operator new(std::size_t s, const std::nothrow_t&) { return malloc(s); } void* operator new(std::size_t s, const std::nothrow_t&) noexcept { return malloc(s); }
void* operator new[](std::size_t s, const std::nothrow_t&) { return malloc(s); } void* operator new[](std::size_t s, const std::nothrow_t&) noexcept { return malloc(s); }
void operator delete(void *p, const std::nothrow_t&) { free(p); } void operator delete(void *p, const std::nothrow_t&) noexcept { free(p); }
void operator delete[](void *p, const std::nothrow_t&) { free(p); } void operator delete[](void *p, const std::nothrow_t&) noexcept { free(p); }