Fixed bugs in GuardCondition handlers, minor modifications to examples.

huntrontrakkr · May 19, 2020 · 97e2dc9 · 97e2dc9
1 parent 17ccf01
commit 97e2dc9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/connextdds/include/PyCondition.hpp b/connextdds/include/PyCondition.hpp
@@ -84,6 +84,8 @@ class PyGuardCondition : public dds::core::cond::GuardCondition, public PyICondi
 public:
     using dds::core::cond::GuardCondition::GuardCondition;
 
+    PyGuardCondition() : dds::core::cond::GuardCondition() {}
+
     PyGuardCondition(const dds::core::cond::GuardCondition& gc) : dds::core::cond::GuardCondition(gc) {}
 
     dds::core::cond::Condition get_condition() override {

diff --git a/connextdds/src/dds/core/cond/GuardCondition.cpp b/connextdds/src/dds/core/cond/GuardCondition.cpp
@@ -11,23 +11,6 @@ void init_class_defs(py::class_<PyGuardCondition, PyICondition>& cls) {
             py::init<>(),
             "Create a GuardCondition in an untriggered state."
         )
-        .def(
-            py::init(
-                [](std::function<void(py::object)>& func) {
-                    PyGuardCondition gc;
-                    gc->handler(
-                        [&func](dds::core::cond::Condition c) {
-                            py::gil_scoped_acquire acquire;
-                            auto gc = dds::core::polymorphic_cast<dds::core::cond::GuardCondition>(c);
-                            func(py::cast(PyGuardCondition(gc)));
-                        }
-                    );
-                    return gc;
-                }
-            ),
-            py::arg("handler"),
-            "Create a GuardCondition in an untriggered state with a handler function."
-        )
         .def(
             py::init(
                 [](PyICondition& c) {
@@ -42,7 +25,7 @@ void init_class_defs(py::class_<PyGuardCondition, PyICondition>& cls) {
             "handler",
             [](PyGuardCondition& gc, std::function<void(PyICondition*)>& func) {
                 gc->handler(
-                    [&func](dds::core::cond::Condition c) {
+                    [func](dds::core::cond::Condition c) {
                         py::gil_scoped_acquire acquire;
                         auto py_c = dds::core::polymorphic_cast<PyGuardCondition>(c);
                         func(&py_c);

diff --git a/examples/dynamic_data_nested_structs/dynamic_data_nested_struct_example.py b/examples/dynamic_data_nested_structs/dynamic_data_nested_struct_example.py
@@ -74,6 +74,7 @@ def create_typecode_outer_struct():
     loaned_inner.data['y'] = 0.00001
 
     print(loaned_inner.data)
-    print('+ current outer_data value')
-    print(outer_data)
+
+print('+ current outer_data value')
+print(outer_data)
 
diff --git a/examples/waitset_status_cond/waitset_cond_modern_publisher.py b/examples/waitset_status_cond/waitset_cond_modern_publisher.py
@@ -14,7 +14,7 @@ def publisher_main(domain_id, sample_count):
 
     count = 0
     while (sample_count == 0) or (count < sample_count):
-        print('Writing waitset_query_cond, count = {}'.format(count))
+        print('Writing Foo, count = {}'.format(count))
         sample['x'] = count
         writer.write(sample)