Updated DDS plugin to use version of Cyclors which supports symbol ma…

…ngling on all platforms.
eclipse-zenoh · Dec 6, 2024 · d8a8fe0 · d8a8fe0
1 parent b58922d
commit d8a8fe0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,8 @@ async-trait = "0.1.66"
 bincode = "1.3.3"
 cdr = "0.2.4"
 clap = "3.2.23"
-cyclors = "=0.3.3"
+#cyclors = "=0.3.4"
+cyclors = { git = "https://github.com/ZettaScaleLabs/cyclors.git", branch = "issue-24-combined" }
 derivative = "2.2.0"
 flume = "0.11.0"
 futures = "0.3.26"

diff --git a/zenoh-bridge-dds/Cargo.toml b/zenoh-bridge-dds/Cargo.toml
@@ -25,6 +25,7 @@ publish = false
 
 [features]
 dds_shm = ["zenoh-plugin-dds/dds_shm"]
+prefix_symbols = ["zenoh-plugin-dds/prefix_symbols"]
 
 [dependencies]
 async-liveliness-monitor = { workspace = true }

diff --git a/zenoh-plugin-dds/Cargo.toml b/zenoh-plugin-dds/Cargo.toml
@@ -30,6 +30,7 @@ crate-type = ["cdylib", "rlib"]
 default = ["dynamic_plugin"]
 dynamic_plugin = []
 dds_shm = ["cyclors/iceoryx"]
+prefix_symbols = ["cyclors/prefix_symbols"]
 stats = ["zenoh/stats"]
 
 [dependencies]