diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2016-03-02 09:05:29 +0100 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2016-03-08 11:15:10 +0100 |
| commit | f9eaa8a9c0b8b65ad49be4e381474debceec5472 (patch) | |
| tree | 5a2af16ef19cce0f1f59cb4daba8b1f1fab022d8 | |
| parent | 2271fa43648ea650e024f82d17b733aba68b5100 (diff) | |
| download | glibmm-f9eaa8a9c0b8b65ad49be4e381474debceec5472.tar.gz | |
Use std::ref instead of sigc::ref.
As required by the latest (not yet released) libsigc++.
| -rw-r--r-- | tests/glibmm_nodetree/main.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/glibmm_nodetree/main.cc b/tests/glibmm_nodetree/main.cc index d5bdc825..fffdafa4 100644 --- a/tests/glibmm_nodetree/main.cc +++ b/tests/glibmm_nodetree/main.cc @@ -83,28 +83,28 @@ main() */ tstring.clear(); - root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), sigc::ref(tstring)), + root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), std::ref(tstring)), Glib::TRAVERSE_PRE_ORDER, type_nodetree_string::TRAVERSE_ALL, -1); g_assert(tstring == "ABCDEFGHIJK"); tstring.clear(); - root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), sigc::ref(tstring)), + root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), std::ref(tstring)), Glib::TRAVERSE_POST_ORDER, type_nodetree_string::TRAVERSE_ALL, -1); g_assert(tstring == "CDEBHIJKGFA"); tstring.clear(); - root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), sigc::ref(tstring)), + root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), std::ref(tstring)), Glib::TRAVERSE_IN_ORDER, type_nodetree_string::TRAVERSE_ALL, -1); g_assert(tstring == "CBDEAHGIJKF"); tstring.clear(); - root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), sigc::ref(tstring)), + root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), std::ref(tstring)), Glib::TRAVERSE_LEVEL_ORDER, type_nodetree_string::TRAVERSE_ALL, -1); g_assert(tstring == "ABFCDEGHIJK"); tstring.clear(); - root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), sigc::ref(tstring)), + root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), std::ref(tstring)), Glib::TRAVERSE_LEVEL_ORDER, type_nodetree_string::TRAVERSE_LEAVES, -1); g_assert(tstring == "CDEHIJK"); tstring.clear(); - root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), sigc::ref(tstring)), + root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), std::ref(tstring)), Glib::TRAVERSE_PRE_ORDER, type_nodetree_string::TRAVERSE_NON_LEAVES, -1); g_assert(tstring == "ABFG"); tstring.clear(); @@ -112,7 +112,7 @@ main() node_B->reverse_children(); node_G->reverse_children(); - root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), sigc::ref(tstring)), + root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), std::ref(tstring)), Glib::TRAVERSE_LEVEL_ORDER, type_nodetree_string::TRAVERSE_ALL, -1); g_assert(tstring == "ABFEDCGKJIH"); tstring.clear(); @@ -121,9 +121,9 @@ main() g_assert(root->node_count(type_nodetree_string::TRAVERSE_ALL) == node->node_count(type_nodetree_string::TRAVERSE_ALL)); g_assert(root->get_max_height() == node->get_max_height()); - root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), sigc::ref(tstring)), + root->traverse(sigc::bind(sigc::ptr_fun(node_build_string), std::ref(tstring)), Glib::TRAVERSE_IN_ORDER, type_nodetree_string::TRAVERSE_ALL, -1); - node->traverse(sigc::bind(sigc::ptr_fun(node_build_string), sigc::ref(cstring)), + node->traverse(sigc::bind(sigc::ptr_fun(node_build_string), std::ref(cstring)), Glib::TRAVERSE_IN_ORDER, type_nodetree_string::TRAVERSE_ALL, -1); g_assert(tstring == cstring); |