Update precompiler definitions check

sashacmc · Jan 29, 2025 · fd62ea0 · fd62ea0
1 parent 6e8ec5b
commit fd62ea0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/examples/universal/z_pub.cxx b/examples/universal/z_pub.cxx
@@ -42,7 +42,7 @@ int _main(int argc, char **argv) {
             .named_value({"k", "key"}, "KEY_EXPRESSION", "Key expression to publish to (string)", default_keyexpr)
             .named_value({"p", "payload"}, "PAYLOAD", "Payload to publish (string)", default_value)
             .named_value({"a", "attach"}, "ATTACHMENT", "Attachment to add to each put (string)", "")
-#if defined(Z_FEATURE_UNSTABLE_API) && defined(ZENOHCXX_ZENOHC) || Z_FEATURE_MATCHING == 1
+#if defined(Z_FEATURE_UNSTABLE_API) && (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_MATCHING == 1)
             .named_flag({"add-matching-listener"}, "Add matching listener")
 #endif
             .run();
@@ -56,7 +56,7 @@ int _main(int argc, char **argv) {
 
     std::cout << "Declaring Publisher on '" << keyexpr << "'..." << std::endl;
     auto pub = session.declare_publisher(KeyExpr(keyexpr));
-#if defined(Z_FEATURE_UNSTABLE_API) && defined(ZENOHCXX_ZENOHC) || Z_FEATURE_MATCHING == 1
+#if defined(Z_FEATURE_UNSTABLE_API) && (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_MATCHING == 1)
     if (args.flag("add-matching-listener")) {
         pub.declare_background_matching_listener(
             [](const MatchingStatus &s) {

diff --git a/examples/universal/z_querier.cxx b/examples/universal/z_querier.cxx
@@ -34,7 +34,7 @@ int _main(int argc, char **argv) {
             .named_value({"t", "target"}, "TARGET", "Query target (BEST_MATCHING | ALL | ALL_COMPLETE)",
                          "BEST_MATCHING")
             .named_value({"o", "timeout"}, "TIMEOUT", "Timeout in ms (number)", "10000")
-#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API) || Z_FEATURE_MATCHING == 1
+#if defined(Z_FEATURE_UNSTABLE_API) && (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_MATCHING == 1)
             .named_flag({"add-matching-listener"}, "Add matching listener")
 #endif
             .run();
@@ -53,7 +53,7 @@ int _main(int argc, char **argv) {
     options.timeout_ms = timeout_ms;
     auto querier = session.declare_querier(selector.key_expr, std::move(options));
 
-#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API) || Z_FEATURE_MATCHING == 1
+#if defined(Z_FEATURE_UNSTABLE_API) && (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_MATCHING == 1)
     if (args.flag("add-matching-listener")) {
         querier.declare_background_matching_listener(
             [](const MatchingStatus &s) {

diff --git a/include/zenoh/api/publisher.hxx b/include/zenoh/api/publisher.hxx
@@ -23,8 +23,10 @@
 #include "interop.hxx"
 #include "keyexpr.hxx"
 #include "timestamp.hxx"
-#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
+#if defined(Z_FEATURE_UNSTABLE_API) && (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_MATCHING == 1)
 #include "matching.hxx"
+#endif
+#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
 #include "source_info.hxx"
 #endif
 #include <optional>
@@ -145,7 +147,7 @@ class Publisher : public Owned<::z_owned_publisher_t> {
     }
 #endif
 
-#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API) || Z_FEATURE_MATCHING == 1
+#if defined(Z_FEATURE_UNSTABLE_API) && (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_MATCHING == 1)
     /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future
     /// release.
     /// @brief Construct matching listener, registering a callback for notifying subscribers matching with a given

diff --git a/include/zenoh/api/querier.hxx b/include/zenoh/api/querier.hxx
@@ -23,8 +23,10 @@
 #include "interop.hxx"
 #include "keyexpr.hxx"
 #include "reply.hxx"
-#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
+#if defined(Z_FEATURE_UNSTABLE_API) && (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_MATCHING == 1)
 #include "matching.hxx"
+#endif
+#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API)
 #include "source_info.hxx"
 #endif
 #include <optional>
@@ -150,7 +152,7 @@ class Querier : public Owned<::z_owned_querier_t> {
     }
 #endif
 
-#if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_UNSTABLE_API) || Z_FEATURE_MATCHING == 1
+#if defined(Z_FEATURE_UNSTABLE_API) && (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_MATCHING == 1)
     /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future
     /// release.
     /// @brief Construct matching listener, registering a callback for notifying queryables matching with a given