Commit 28239a80 authored by Volker Krause's avatar Volker Krause
Browse files

Fix JNI_PROPERTY use outside of the KAndroidExtras namespace

parent c04231dc
Pipeline #178069 passed with stage
in 2 minutes and 13 seconds
......@@ -158,7 +158,7 @@ private: \
}; \
friend class KAndroidExtras::Internal::PropertyBase<_jni_ThisType, _jni_ ## name ## __OffsetHolder>; \
public: \
[[no_unique_address]] KAndroidExtras::Internal::Property<type, _jni_ThisType, _jni_ ## name ## __NameHolder, _jni_ ## name ## __OffsetHolder, Jni::is_basic_type<type>::value> name;
[[no_unique_address]] KAndroidExtras::Internal::Property<type, _jni_ThisType, _jni_ ## name ## __NameHolder, _jni_ ## name ## __OffsetHolder, KAndroidExtras::Jni::is_basic_type<type>::value> name;
}
#endif // KANDROIDEXTRAS_JNIPROPERTIES_H
......@@ -8,6 +8,7 @@
#define KANDROIDEXTRAS_JNISIGNATURE_H
#include "jnicommon.h"
#include "jnitypes.h"
#include <jni.h>
#include <cstdint>
......@@ -53,7 +54,7 @@ template <typename, typename> struct staticStringFromJniType;
template <typename T, std::size_t... Indexes>
struct staticStringFromJniType<T, std::index_sequence<Indexes...>>
{
typedef StaticString<T::jniName()[Indexes]...> value;
typedef StaticString<Jni::typeName<T>()[Indexes]...> value;
};
/** Meta function for assembling JNI signatures. */
......@@ -63,7 +64,7 @@ struct JniSignature
constexpr inline auto operator()() const
{
using namespace Internal;
return static_concat(StaticString<'L'>(), typename staticStringFromJniType<T, std::make_index_sequence<static_strlen(T::jniName())>>::value(), StaticString<';'>());
return static_concat(StaticString<'L'>(), typename staticStringFromJniType<T, std::make_index_sequence<static_strlen(Jni::typeName<T>())>>::value(), StaticString<';'>());
}
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment