Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align renamed API calls #221

Merged
merged 3 commits into from
Sep 17, 2024
Merged

Align renamed API calls #221

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e157fb8
Rename zc_config_insert_json to zc_config_insert_json5
sashacmc Sep 17, 2024
d4cc7e7
Use zp_hello_locators for zenoh-pico
sashacmc Sep 17, 2024
432ae6e
Rename config.insert_json to config.insert_json5
sashacmc Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/zenoh/api/config.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class Config : public Owned<::z_owned_config_t> {
/// @return true if the parameter was inserted, false otherwise.
/// @note zenoh-c only.
void insert_json(const std::string& key, const std::string& value, ZResult* err = nullptr) {
sashacmc marked this conversation as resolved.
Show resolved Hide resolved
__ZENOH_RESULT_CHECK(::zc_config_insert_json(interop::as_loaned_c_ptr(*this), key.c_str(), value.c_str()), err,
__ZENOH_RESULT_CHECK(::zc_config_insert_json5(interop::as_loaned_c_ptr(*this), key.c_str(), value.c_str()), err,
std::string("Failed to insert '")
.append(value)
.append("' for the key '")
Expand Down Expand Up @@ -149,4 +149,4 @@ class Config : public Owned<::z_owned_config_t> {
}
#endif
};
} // namespace zenoh
} // namespace zenoh
4 changes: 2 additions & 2 deletions include/zenoh/api/hello.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Hello : public Owned<::z_owned_hello_t> {
::z_hello_locators(interop::as_loaned_c_ptr(*this), &out);
auto out_loaned = ::z_loan(out);
#else
auto out_loaned = ::z_hello_locators(interop::as_loaned_c_ptr(*this));
auto out_loaned = ::zp_hello_locators(interop::as_loaned_c_ptr(*this));
sashacmc marked this conversation as resolved.
Show resolved Hide resolved
#endif
std::vector<std::string_view> locators(::z_string_array_len(out_loaned));
for (size_t i = 0; i < ::z_string_array_len(out_loaned); i++) {
Expand Down Expand Up @@ -83,4 +83,4 @@ class Hello : public Owned<::z_owned_hello_t> {
/// @brief Move assignment operator.
Hello& operator=(Hello&& other) = default;
};
} // namespace zenoh
} // namespace zenoh
2 changes: 1 addition & 1 deletion zenoh-c
Open in desktop
Submodule zenoh-c updated 26 files
+27 −27 Cargo.lock
+27 −27 build-resources/opaque-types/Cargo.lock
+66 −38 build.rs
+18 −1 docs/api.rst
+159 −0 docs/concepts.rst
+1 −0 docs/index.rst
+3 −3 examples/parse_args.h
+1 −1 examples/z_get_shm.c
+1 −1 examples/z_pub_cache.c
+1 −1 examples/z_pub_shm_thr.c
+1 −1 examples/z_queryable_shm.c
+1 −1 examples/z_sub.c
+1 −1 examples/z_sub_shm.c
+1 −1 examples/z_sub_thr.c
+109 −17 include/zenoh_commons.h
+34 −43 include/zenoh_macros.h
+19 −0 src/closures/hello_closure.rs
+27 −0 src/closures/log_closure.rs
+20 −0 src/closures/matching_status_closure.rs
+19 −0 src/closures/query_closure.rs
+19 −0 src/closures/reply_closure.rs
+19 −0 src/closures/sample_closure.rs
+19 −0 src/closures/zenohid_closure.rs
+3 −3 src/config.rs
+3 −3 tests/z_api_config_test.c
+1 −1 tests/z_int_pub_cache_query_sub_test.c
2 changes: 1 addition & 1 deletion zenoh-pico
Open in desktop
Submodule zenoh-pico updated 17 files
+36 −0 .github/workflows/build-check.yaml
+1 −0 CMakeLists.txt
+8 −0 README.md
+1 −0 docs/api.rst
+1 −1 examples/arduino/z_scout.ino
+1 −1 examples/espidf/z_scout.c
+1 −1 examples/freertos_plus_tcp/z_scout.c
+1 −1 examples/mbed/z_scout.cpp
+1 −1 examples/unix/c11/z_scout.c
+1 −1 examples/unix/c99/z_scout.c
+1 −1 examples/windows/z_scout.c
+1 −1 examples/zephyr/z_scout.c
+18 −2 include/zenoh-pico/api/primitives.h
+6 −0 include/zenoh-pico/api/types.h
+29 −3 src/api/api.c
+177 −0 tests/memory_leak.py
+68 −1 tests/z_data_struct_test.c
Loading