From b856e282b72d06b20194c628b7a97ecddc5b2bbd Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Wed, 5 Feb 2025 13:28:05 +0300 Subject: [PATCH] Better interop defines Signed-off-by: Nikolay Igotti --- interop/src/cpp/ets/convertors-ets.cc | 4 ++-- interop/src/cpp/ets/convertors-ets.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/interop/src/cpp/ets/convertors-ets.cc b/interop/src/cpp/ets/convertors-ets.cc index d6f66171c..67fb71da6 100644 --- a/interop/src/cpp/ets/convertors-ets.cc +++ b/interop/src/cpp/ets/convertors-ets.cc @@ -13,11 +13,11 @@ * limitations under the License. */ -#define KOALA_INTEROP_MODULE #include #include "convertors-ets.h" #include "signatures.h" #include "interop-logging.h" +#include "interop-types.h" static const char* nativeModule = "@koalaui/arkts-arkui/generated/arkts/NativeModuleLoader/NativeModuleLoader"; static const char* callCallbackFromNative = "callCallbackFromNative"; @@ -148,5 +148,5 @@ const std::string& EtsExports::getClasspath(const std::string& module) { if (defaultClasspath != g_defaultClasspaths.end()) { return defaultClasspath->second; } - LOGE("Classpath for module %s was not registered", module.c_str()); + INTEROP_FATAL("Classpath for module %s was not registered", module.c_str()); } diff --git a/interop/src/cpp/ets/convertors-ets.h b/interop/src/cpp/ets/convertors-ets.h index c247eaf84..8afb5e25c 100644 --- a/interop/src/cpp/ets/convertors-ets.h +++ b/interop/src/cpp/ets/convertors-ets.h @@ -28,10 +28,6 @@ #include "etsapi.h" #include "koala-types.h" -#ifndef KOALA_INTEROP_MODULE -#error KOALA_INTEROP_MODULE is undefined -#endif - template struct InteropTypeConverter { using InteropType = T; -- Gitee