diff options
author | Krzysztof KosiĆski <krzysio@google.com> | 2023-10-13 19:47:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-13 19:47:39 +0000 |
commit | de582ad23e95c3c2def053a78a57ac7f3a33e105 (patch) | |
tree | 124c7e9f5ba1b79387f9436ed1390ab211e7a0fd | |
parent | 75869fb0092468011aadfdfda0e733fdeae01f4a (diff) | |
parent | ef727660e85743274affb902c2c17e57da86ab6f (diff) | |
download | libnativehelper-de582ad23e95c3c2def053a78a57ac7f3a33e105.tar.gz |
Merge "Remove deprecated constexpr storage from test." into main am: ef727660e8
Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2768716
Change-Id: Ic18eb776bf98953b5d0613af42eb9d0e42d80d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | tests/JniSafeRegisterNativeMethods_test.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/JniSafeRegisterNativeMethods_test.cpp b/tests/JniSafeRegisterNativeMethods_test.cpp index e7b0fc4..00571c2 100644 --- a/tests/JniSafeRegisterNativeMethods_test.cpp +++ b/tests/JniSafeRegisterNativeMethods_test.cpp @@ -14,24 +14,12 @@ * limitations under the License. */ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wused-but-marked-unused" -#pragma clang diagnostic ignored "-Wdeprecated" #include <gtest/gtest.h> -#pragma clang diagnostic pop #include <sstream> #define PARSE_FAILURES_NONFATAL // return empty optionals wherever possible instead of asserting. #include "nativehelper/jni_macros.h" -// Provide static storage to these values so they can be used in a runtime context. -// This has to be defined local to the test translation unit to avoid ODR violations prior to C++17. -#define STORAGE_FN_FOR_JNI_TRAITS(jtype, ...) \ -constexpr char nativehelper::detail::jni_type_trait<jtype>::type_descriptor[]; \ -constexpr char nativehelper::detail::jni_type_trait<jtype>::type_name[]; - -DEFINE_JNI_TYPE_TRAIT(STORAGE_FN_FOR_JNI_TRAITS) - template <typename T> std::string stringify_helper(const T& val) { std::stringstream ss; |