Thunder: Improve WPEFramework namespace backwards compatibility (#1675)

Co-authored-by: MFransen69 <[email protected]>
rdkcentral · Jul 1, 2024 · 375b9bf · 375b9bf
1 parent 535a37d
commit 375b9bf
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 0 deletions.
diff --git a/Source/com/com.h b/Source/com/com.h
@@ -37,3 +37,5 @@
 #if defined(__WINDOWS__) && !defined(COM_EXPORTS)
 #pragma comment(lib, "com.lib")
 #endif
+
+WPEFRAMEWORK_NESTEDNAMESPACE_COMPATIBILIY(RPC)
diff --git a/Source/core/Portability.h b/Source/core/Portability.h
@@ -960,6 +960,13 @@ namespace WPEFramework {
     using namespace Thunder;
 }
 
+#define WPEFRAMEWORK_NESTEDNAMESPACE_COMPATIBILIY(NESTED_NAMESPACE) \
+namespace WPEFramework { \
+namespace NESTED_NAMESPACE { \
+    using namespace Thunder::NESTED_NAMESPACE; \
+} \
+}
+
 extern "C" {
 
 #ifdef __WINDOWS__

diff --git a/Source/core/core.h b/Source/core/core.h
@@ -109,4 +109,5 @@
 #pragma comment(lib, "core.lib")
 #endif
 
+WPEFRAMEWORK_NESTEDNAMESPACE_COMPATIBILIY(Core)
 #endif
diff --git a/Source/cryptalgo/cryptalgo.h b/Source/cryptalgo/cryptalgo.h
@@ -36,3 +36,5 @@
 #ifdef __WINDOWS__
 #pragma comment(lib, "cryptalgo.lib")
 #endif
+
+WPEFRAMEWORK_NESTEDNAMESPACE_COMPATIBILIY(Crypto)
diff --git a/Source/extensions/warningreporting/warningreporting.h b/Source/extensions/warningreporting/warningreporting.h
@@ -29,3 +29,5 @@
 #ifdef __WINDOWS__
 #pragma comment(lib, "warningreporting.lib")
 #endif
+
+WPEFRAMEWORK_NESTEDNAMESPACE_COMPATIBILIY(WarningReporting)
diff --git a/Source/messaging/messaging.h b/Source/messaging/messaging.h
@@ -38,3 +38,5 @@
 #ifdef __WINDOWS__
 #pragma comment(lib, "messaging.lib")
 #endif
+
+WPEFRAMEWORK_NESTEDNAMESPACE_COMPATIBILIY(Messaging)
diff --git a/Source/plugins/plugins.h b/Source/plugins/plugins.h
@@ -51,3 +51,6 @@
 #ifdef __WINDOWS__
 #pragma comment(lib, "plugins.lib")
 #endif
+
+WPEFRAMEWORK_NESTEDNAMESPACE_COMPATIBILIY(Plugin)
+WPEFRAMEWORK_NESTEDNAMESPACE_COMPATIBILIY(PluginHost)
diff --git a/Source/websocket/websocket.h b/Source/websocket/websocket.h
@@ -37,3 +37,6 @@
 #ifdef __WINDOWS__
 #pragma comment(lib, "websocket.lib")
 #endif
+
+WPEFRAMEWORK_NESTEDNAMESPACE_COMPATIBILIY(Web)
+WPEFRAMEWORK_NESTEDNAMESPACE_COMPATIBILIY(JSONRPC)