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

Fixes for GCC 9 and clang 10 #57

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes for GCC 9 and clang 10 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0d5f29
Fix compiler version detection and print compiler information
dv1 Jul 9, 2020
17fbef2
Fix shadowed arguments
dv1 Jul 9, 2020
4ab1bae
Workaround for GCC specific signed - unsigned comparison
dv1 Jul 9, 2020
572226e
Fix GCC compile error due to incompatible type cast
dv1 Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ BUILD := build/$(VARIANT)
COMPILER := $(shell CXX="${CXX}" misc/compiler.sh)
COMPILER_MAJOR_VERSION := $(shell CXX="${CXX}" misc/compiler-major-version.sh)

$(info Compiler: "${COMPILER}" major version: "${COMPILER_MAJOR_VERSION}")

ifeq ($(COMPILER), clang)
CXXFLAGS_WARNINGS := -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-exit-time-destructors
ifeq ($(shell test $(COMPILER_MAJOR_VERSION) -gt 4; echo $$?),0)
Expand Down
12 changes: 6 additions & 6 deletions include/jni/unique.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ namespace jni
using Base = T;
using UntaggedType = typename T::UntaggedType;

explicit Unique(std::nullptr_t ptr = nullptr)
: T(ptr),
explicit Unique(std::nullptr_t ptr_ = nullptr)
: T(ptr_),
deleter() {}

explicit Unique(JNIEnv& env, UntaggedType* ptr)
: T(ptr),
explicit Unique(JNIEnv& env, UntaggedType* ptr_)
: T(ptr_),
deleter(env) {}

Unique(Unique&& other)
Expand All @@ -76,10 +76,10 @@ namespace jni
return *this;
}

void reset(UntaggedType* ptr = nullptr)
void reset(UntaggedType* ptr_ = nullptr)
{
UntaggedType* current = this->get();
T::reset(ptr);
T::reset(ptr_);
if (current)
{
get_deleter()(current);
Expand Down
2 changes: 1 addition & 1 deletion include/jni/wrapping.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace jni

::jsize Unwrap(jsize s) const
{
if (s > std::numeric_limits<::jsize>::max())
if (s > jsize(std::numeric_limits<::jsize>::max()))
throw std::range_error("jsize > max");
return static_cast<::jsize>(s);
}
Expand Down
4 changes: 2 additions & 2 deletions misc/compiler-major-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ compiler=$(${CXX} -v 2>&1)

case $compiler in
*clang*|*gcc*)
version=`${CXX} --version | grep -o '\([0-9]\)\+.\([0-9]\)\+.\([0-9]\)\+'`
echo ${version::1}
version=`${CXX} --version | grep -o '\([0-9]\)\+.\([0-9]\)\+.\([0-9]\)\+' | sed -e 's/^\([0-9]*\).*/\1/' | head -n1`
echo "${version}"
;;
*)
echo
Expand Down
6 changes: 3 additions & 3 deletions test/high_level.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,15 +669,15 @@ int main()

auto voidTrue = jni::MakeNativeMethod("voidTrue", [] (JNIEnv&, ObjectOrClass&, jni::jboolean b) { assert( b); });
assert(voidTrue.signature == std::string("(Z)V"));
reinterpret_cast<jboolean (*)(JNIEnv*, jobject, jboolean)>(voidTrue.fnPtr)(&env, nullptr, JNI_TRUE);
reinterpret_cast<void (*)(JNIEnv*, jobject, jboolean)>(voidTrue.fnPtr)(&env, nullptr, JNI_TRUE);

auto voidFalse = jni::MakeNativeMethod("voidFalse", [] (JNIEnv&, ObjectOrClass&, jni::jboolean b) { assert(!b); });
assert(voidFalse.signature == std::string("(Z)V"));
reinterpret_cast<jboolean (*)(JNIEnv*, jobject, jboolean)>(voidFalse.fnPtr)(&env, nullptr, JNI_FALSE);
reinterpret_cast<void (*)(JNIEnv*, jobject, jboolean)>(voidFalse.fnPtr)(&env, nullptr, JNI_FALSE);

auto voidObject = jni::MakeNativeMethod("voidObject", [] (JNIEnv&, ObjectOrClass&, jni::Object<Test>&) {});
assert(voidObject.signature == std::string("(Lmapbox/com/Test;)V"));
reinterpret_cast<jboolean (*)(JNIEnv*, jobject, jobject)>(voidObject.fnPtr)(&env, nullptr, nullptr);
reinterpret_cast<void (*)(JNIEnv*, jobject, jobject)>(voidObject.fnPtr)(&env, nullptr, nullptr);

auto objectVoid = jni::MakeNativeMethod("objectVoid", [] (JNIEnv&, ObjectOrClass&) -> jni::Local<jni::Object<Test>> { return jni::Local<jni::Object<Test>>(); });
assert(objectVoid.signature == std::string("()Lmapbox/com/Test;"));
Expand Down