[Fawkes Git] branch/common/master-merge-review: 13 revs updated. (0.5.0-3329-g7c82d9a)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Mon Sep 5 14:25:55 CEST 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, common/master-merge-review has been updated
        to  7c82d9a84a11c40ed762a986f09b863a7f277b0b (commit)
       via  110a56c03389af4e1ddfb0ccd7cceaa92656f7de (commit)
       via  ef5043ee4cb44a254ed4e1c03b47629a97b7d30a (commit)
       via  c8ffb3f4a7a79447332be5162afba4e7fdbf62d4 (commit)
       via  17f4d6415f48ed6ee8492c8a98f1f20468ec919c (commit)
       via  d1203799c00804e06eb543e0c4ddeae885253dd2 (commit)
       via  2f8f4967a33bd2b75b190d30e60ed5fcdeb88d97 (commit)
       via  1ed2ef4b4272c1950b24ec666d5df4db5b8c2b79 (commit)
       via  2abff4cfa8afb1b55541a9904299ffbeced32bb8 (commit)
       via  723f2db939d2e56d4fa230cede32d4576f106725 (commit)
       via  8ad6e71c8d6ce0e9b3fa84574f2bded16a08ed5c (commit)
       via  59b52f051242b1f4b6cc75d6e788be3ba75dc032 (commit)
       via  6d1773fbe8a93458f3f69b31bdd2e4b11e14c76e (commit)
      from  ca77d936f4afdf52ef548bb65758c3541aeefd4e (commit)

http://git.fawkesrobotics.org/fawkes.git/common/master-merge-review

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- *Log* ---------------------------------------------------------------
commit 6d1773fbe8a93458f3f69b31bdd2e4b11e14c76e
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:51:09 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:44 2016 +0200

    fvwidgets: remove code for glibmm without exceptions

http://git.fawkesrobotics.org/fawkes.git/commit/6d1773f
http://trac.fawkesrobotics.org/changeset/6d1773f

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 59b52f051242b1f4b6cc75d6e788be3ba75dc032
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:51:21 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:44 2016 +0200

    gui_utils: remove code for glibmm without exceptions

http://git.fawkesrobotics.org/fawkes.git/commit/59b52f0
http://trac.fawkesrobotics.org/changeset/59b52f0

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 8ad6e71c8d6ce0e9b3fa84574f2bded16a08ed5c
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:51:34 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:45 2016 +0200

    netloggui: remove code for glibmm without exceptions

http://git.fawkesrobotics.org/fawkes.git/commit/8ad6e71
http://trac.fawkesrobotics.org/changeset/8ad6e71

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 723f2db939d2e56d4fa230cede32d4576f106725
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:52:15 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:45 2016 +0200

    plugin_gui: remove code for glibmm without exceptions

http://git.fawkesrobotics.org/fawkes.git/commit/723f2db
http://trac.fawkesrobotics.org/changeset/723f2db

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 2abff4cfa8afb1b55541a9904299ffbeced32bb8
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:52:27 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:46 2016 +0200

    skillgui: remove code for glibmm without exceptions

http://git.fawkesrobotics.org/fawkes.git/commit/2abff4c
http://trac.fawkesrobotics.org/changeset/2abff4c

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 1ed2ef4b4272c1950b24ec666d5df4db5b8c2b79
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:52:39 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:46 2016 +0200

    firestation: remove code for glibmm without exceptions

http://git.fawkesrobotics.org/fawkes.git/commit/1ed2ef4
http://trac.fawkesrobotics.org/changeset/1ed2ef4

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 2f8f4967a33bd2b75b190d30e60ed5fcdeb88d97
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:52:48 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:47 2016 +0200

    fuse_viewer: remove code for glibmm without exceptions

http://git.fawkesrobotics.org/fawkes.git/commit/2f8f496
http://trac.fawkesrobotics.org/changeset/2f8f496

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit d1203799c00804e06eb543e0c4ddeae885253dd2
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:52:55 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:47 2016 +0200

    yuv_viewer: remove code for glibmm without exceptions

http://git.fawkesrobotics.org/fawkes.git/commit/d120379
http://trac.fawkesrobotics.org/changeset/d120379

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 17f4d6415f48ed6ee8492c8a98f1f20468ec919c
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:53:19 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:48 2016 +0200

    lasergui: support builds for new and old glibmm
    
    Old versions used std::auto_ptr, while 2.48 and later use
    std::unique_ptr. Support both conditionally.

http://git.fawkesrobotics.org/fawkes.git/commit/17f4d64
http://trac.fawkesrobotics.org/changeset/17f4d64

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit c8ffb3f4a7a79447332be5162afba4e7fdbf62d4
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 13:42:43 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:48 2016 +0200

    openprs: conditional use of unique_ptr
    
    Bring back support for older systems with auto_ptr.

http://git.fawkesrobotics.org/fawkes.git/commit/c8ffb3f
http://trac.fawkesrobotics.org/changeset/c8ffb3f

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit ef5043ee4cb44a254ed4e1c03b47629a97b7d30a
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 13:44:21 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:49 2016 +0200

    pcl-db: make C++11 or later mandatory requirement

http://git.fawkesrobotics.org/fawkes.git/commit/ef5043e
http://trac.fawkesrobotics.org/changeset/ef5043e

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 110a56c03389af4e1ddfb0ccd7cceaa92656f7de
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 13:45:01 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:49 2016 +0200

    static-transforms: conditional use of unique_ptr

http://git.fawkesrobotics.org/fawkes.git/commit/110a56c
http://trac.fawkesrobotics.org/changeset/110a56c

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 7c82d9a84a11c40ed762a986f09b863a7f277b0b
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 13:45:21 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:57:50 2016 +0200

    webview-ptzcam: conditional use of unique_ptr

http://git.fawkesrobotics.org/fawkes.git/commit/7c82d9a
http://trac.fawkesrobotics.org/changeset/7c82d9a

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 src/libs/fvwidgets/image_widget.cpp                |    5 -----
 src/libs/gui_utils/plugin_tree_view.cpp            |   20 --------------------
 src/plugins/openprs/mod_config.cpp                 |    4 ++++
 src/plugins/perception/pcl-db/Makefile             |   11 ++++++++---
 .../static_transforms/static_transforms_thread.cpp |    4 ++++
 .../webview-ptzcam/webview-ptzcam-thread.cpp       |    4 ++++
 src/tools/lasergui/lasergui.cpp                    |    4 ++++
 src/tools/lasergui/lasergui_hildon.cpp             |    4 ++++
 src/tools/netloggui/main.cpp                       |    6 ------
 src/tools/plugin_gui/main.cpp                      |   10 ----------
 src/tools/skillgui/skillgui.cpp                    |    5 -----
 src/tools/vision/firestation/main.cpp              |    6 ------
 src/tools/vision/fuse_viewer/main.cpp              |    9 ---------
 src/tools/vision/yuv_viewer/main.cpp               |    9 ---------
 14 files changed, 28 insertions(+), 73 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* 6d1773fbe8a93458f3f69b31bdd2e4b11e14c76e - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:51:09 2016 +0200
Subject: fvwidgets: remove code for glibmm without exceptions

 src/libs/fvwidgets/image_widget.cpp |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/fvwidgets/image_widget.cpp b/src/libs/fvwidgets/image_widget.cpp
index eccf68c..bf43c03 100644
--- a/src/libs/fvwidgets/image_widget.cpp
+++ b/src/libs/fvwidgets/image_widget.cpp
@@ -433,12 +433,7 @@ ImageWidget::save_image(std::string filename, Glib::ustring type) const throw()
   __cam_mutex->lock();
 
   try {
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
     __pixbuf->save(filename, type);
-#else
-    std::unique_ptr<Glib::Error> error;
-    __pixbuf->save(filename, type, error);
-#endif
     __cam_mutex->unlock();
     return true;
   }

- *commit* 59b52f051242b1f4b6cc75d6e788be3ba75dc032 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:51:21 2016 +0200
Subject: gui_utils: remove code for glibmm without exceptions

 src/libs/gui_utils/plugin_tree_view.cpp |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/gui_utils/plugin_tree_view.cpp b/src/libs/gui_utils/plugin_tree_view.cpp
index 79dc204..bf933ef 100644
--- a/src/libs/gui_utils/plugin_tree_view.cpp
+++ b/src/libs/gui_utils/plugin_tree_view.cpp
@@ -122,12 +122,7 @@ PluginTreeView::~PluginTreeView()
 
 #ifdef HAVE_GCONFMM
   if (__gconf) {
-#  ifdef GLIBMM_EXCEPTIONS_ENABLED
     __gconf->remove_dir(__gconf_prefix);
-#  else
-    std::unique_ptr<Glib::Error> error;
-    __gconf->remove_dir(__gconf_prefix, error);
-#  endif
   }
 #endif
 }
@@ -153,20 +148,10 @@ PluginTreeView::set_gconf_prefix(Glib::ustring gconf_prefix)
   if (! __gconf) {
     __gconf = Gnome::Conf::Client::get_default_client();
   } else {
-#  ifdef GLIBMM_EXCEPTIONS_ENABLED
     __gconf->remove_dir(__gconf_prefix);
-#  else
-    std::unique_ptr<Glib::Error> error;
-    __gconf->remove_dir(__gconf_prefix, error);
-#  endif
   }
 
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
   __gconf->add_dir(gconf_prefix);
-#else
-  std::unique_ptr<Glib::Error> error;
-  __gconf->add_dir(gconf_prefix, Gnome::Conf::CLIENT_PRELOAD_NONE, error);
-#endif
   __gconf_prefix = gconf_prefix;
 
   if (__gconf_connection) {
@@ -445,12 +430,7 @@ PluginTreeView::append_plugin_column()
 #  ifdef HAVE_GCONFMM
   if ( __gconf )
   {
-#    ifdef GLIBMM_EXCEPTIONS_ENABLED
     description_as_tooltip = __gconf->get_bool(__gconf_prefix + "/description_as_tooltip");
-#    else
-    std::unique_ptr<Glib::Error> error;
-    description_as_tooltip = __gconf->get_bool(__gconf_prefix + "/description_as_tooltip", error);
-#    endif
   }
 #  endif
 #endif

- *commit* 8ad6e71c8d6ce0e9b3fa84574f2bded16a08ed5c - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:51:34 2016 +0200
Subject: netloggui: remove code for glibmm without exceptions

 src/tools/netloggui/main.cpp |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

_Diff for modified files_:
diff --git a/src/tools/netloggui/main.cpp b/src/tools/netloggui/main.cpp
index cebe0a3..9a097fd 100644
--- a/src/tools/netloggui/main.cpp
+++ b/src/tools/netloggui/main.cpp
@@ -29,13 +29,7 @@ main(int argc, char **argv) {
   Gtk::Main gtk_main(argc, argv);
 
   Glib::RefPtr<Gtk::Builder> builder;
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
   builder = Gtk::Builder::create_from_file(RESDIR"/guis/netloggui/netloggui.ui");
-#else
-  Glib::RefPtr<Gtk::BuilderError> error;
-  builder =
-    Gtk::Builder::create_from_file(RESDIR"/guis/netloggui/netloggui.ui", error);
-#endif
 
   NetLogGuiGtkWindow *window = NULL;
   builder->get_widget_derived("wnd_netloggui", window);

- *commit* 723f2db939d2e56d4fa230cede32d4576f106725 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:52:15 2016 +0200
Subject: plugin_gui: remove code for glibmm without exceptions

 src/tools/plugin_gui/main.cpp |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

_Diff for modified files_:
diff --git a/src/tools/plugin_gui/main.cpp b/src/tools/plugin_gui/main.cpp
index cc9a2dd..fba07e3 100644
--- a/src/tools/plugin_gui/main.cpp
+++ b/src/tools/plugin_gui/main.cpp
@@ -46,22 +46,12 @@ int main(int argc, char** argv)
 #endif
 
     Glib::RefPtr<Gtk::Builder> builder;
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
     try {
       builder =
         Gtk::Builder::create_from_file(UI_FILE);
     } catch (Gtk::BuilderError &e) {
       printf("Failed to create GUI: %s\n", e.what().c_str());
     }
-#else
-    std::unique_ptr<Gtk::BuilderError> error;
-    Glib::RefPtr<Gtk::Builder> builder =
-      Gtk::Builder::create_from_file(UI_FILE, error);
-    if (error.get()) {
-      throw fawkes::Exception("Failed to load Glade file: %s",
-                              error->what().c_str());
-    }
-#endif
 
     PluginGuiGtkWindow *window = NULL;
     builder->get_widget_derived("wndMain", window);

- *commit* 2abff4cfa8afb1b55541a9904299ffbeced32bb8 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:52:27 2016 +0200
Subject: skillgui: remove code for glibmm without exceptions

 src/tools/skillgui/skillgui.cpp |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

_Diff for modified files_:
diff --git a/src/tools/skillgui/skillgui.cpp b/src/tools/skillgui/skillgui.cpp
index b9627e8..7a0df68 100644
--- a/src/tools/skillgui/skillgui.cpp
+++ b/src/tools/skillgui/skillgui.cpp
@@ -234,12 +234,7 @@ SkillGuiGtkWindow::on_config_changed()
     row[__sks_record.skillstring] = *i;
   }
 
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool colored    = __gconf->get_bool(GCONF_PREFIX"/graph_colored");
-#else
-  std::unique_ptr<Glib::Error> error;
-  bool colored    = __gconf->get_bool(GCONF_PREFIX"/graph_colored", error);
-#endif
   tb_graphcolored->set_active(colored);
 #endif
 }

- *commit* 1ed2ef4b4272c1950b24ec666d5df4db5b8c2b79 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:52:39 2016 +0200
Subject: firestation: remove code for glibmm without exceptions

 src/tools/vision/firestation/main.cpp |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

_Diff for modified files_:
diff --git a/src/tools/vision/firestation/main.cpp b/src/tools/vision/firestation/main.cpp
index b322b60..590544d 100644
--- a/src/tools/vision/firestation/main.cpp
+++ b/src/tools/vision/firestation/main.cpp
@@ -30,14 +30,8 @@ int main(int argc, char** argv)
   try
   {
     Gtk::Main kit(argc, argv);
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
     Glib::RefPtr<Gtk::Builder> builder =
       Gtk::Builder::create_from_file(RESDIR"/guis/firestation/firestation.ui");
-#else
-    std::unique_ptr<Gtk::BuilderError> error;
-    Glib::RefPtr<Gtk::Builder> builder =
-      Gtk::Builder::create_from_file(RESDIR"/guis/firestation/firestation.ui", error);
-#endif
     Firestation firestation(builder);
     kit.run(firestation.get_window());
     return 0;

- *commit* 2f8f4967a33bd2b75b190d30e60ed5fcdeb88d97 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:52:48 2016 +0200
Subject: fuse_viewer: remove code for glibmm without exceptions

 src/tools/vision/fuse_viewer/main.cpp |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

_Diff for modified files_:
diff --git a/src/tools/vision/fuse_viewer/main.cpp b/src/tools/vision/fuse_viewer/main.cpp
index ae92bfd..78c2540 100644
--- a/src/tools/vision/fuse_viewer/main.cpp
+++ b/src/tools/vision/fuse_viewer/main.cpp
@@ -36,17 +36,8 @@ int main(int argc, char** argv)
   {
     Gtk::Main kit(argc, argv);
 
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
     Glib::RefPtr<Gtk::Builder> builder =
       Gtk::Builder::create_from_file(RESDIR"/guis/fuse_viewer/fuse_viewer.ui");
-#else
-    std::unique_ptr<Gtk::BuilderError> error;
-    Glib::RefPtr<Gtk::Builder> builder =
-      Gtk::Builder::create_from_file(RESDIR"/guis/fuse_viewer/fuse_viewer.ui", error);
-    if (error.get()) {
-      throw fawkes::Exception("Failed to load UI file: %s", error->what().c_str());
-    }
-#endif
 
     FuseViewerGtkWindow *window = NULL;
     builder->get_widget_derived("wndMain", window);

- *commit* d1203799c00804e06eb543e0c4ddeae885253dd2 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:52:55 2016 +0200
Subject: yuv_viewer: remove code for glibmm without exceptions

 src/tools/vision/yuv_viewer/main.cpp |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

_Diff for modified files_:
diff --git a/src/tools/vision/yuv_viewer/main.cpp b/src/tools/vision/yuv_viewer/main.cpp
index 306e5d0..751d41a 100644
--- a/src/tools/vision/yuv_viewer/main.cpp
+++ b/src/tools/vision/yuv_viewer/main.cpp
@@ -36,17 +36,8 @@ int main(int argc, char** argv)
   {
     Gtk::Main kit(argc, argv);
 
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
     Glib::RefPtr<Gtk::Builder> builder =
       Gtk::Builder::create_from_file(RESDIR"/guis/yuv_viewer/yuv_viewer.ui");
-#else
-    Glib::RefPtr<Gtk::BuilderError> error;
-    Glib::RefPtr<Gtk::Builder> builder =
-      Gtk::Builder::create(RESDIR"/guis/yuv_viewer/yuv_viewer.ui", error);
-    if (error.get()) {
-      throw fawkes::Exception("Failed to load UI file: %s", error->what().c_str());
-    }
-#endif
 
     YuvViewerGtkWindow *window = NULL;
     builder->get_widget_derived("wndMain", window);

- *commit* 17f4d6415f48ed6ee8492c8a98f1f20468ec919c - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:53:19 2016 +0200
Subject: lasergui: support builds for new and old glibmm

 src/tools/lasergui/lasergui.cpp        |    4 ++++
 src/tools/lasergui/lasergui_hildon.cpp |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/tools/lasergui/lasergui.cpp b/src/tools/lasergui/lasergui.cpp
index fbc1930..6a1e747 100644
--- a/src/tools/lasergui/lasergui.cpp
+++ b/src/tools/lasergui/lasergui.cpp
@@ -160,7 +160,11 @@ class LaserGuiGtkWindow : public Gtk::Window
       md.set_title("Interface Selection Failed");
       md.run();
     } else {
+#if __cplusplus >= 201103L
       std::unique_ptr<MultiInterfaceChooserDialog> ifcd(
+#else
+      std::auto_ptr<MultiInterfaceChooserDialog> ifcd(
+#endif
           MultiInterfaceChooserDialog::create(*this,
                                               __bb,
                                               "Laser*Interface",
diff --git a/src/tools/lasergui/lasergui_hildon.cpp b/src/tools/lasergui/lasergui_hildon.cpp
index 6a080eb..33cf95c 100644
--- a/src/tools/lasergui/lasergui_hildon.cpp
+++ b/src/tools/lasergui/lasergui_hildon.cpp
@@ -72,7 +72,11 @@ class LaserGuiHildonWindow : public Hildon::Window
     __laser_if = NULL;
     __ifd = NULL;
 
+#  if GLIBMM_MAJOR_VERSION > 2 || (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION >= 48)
     std::unique_ptr<Glib::Error> error;
+#  else
+    std::auto_ptr<Glib::Error> error;
+#  endif
     set_icon_from_file(RESDIR"/guis/lasergui/lines_"ICON_FORMAT".png", error);
 
     add(__area);

- *commit* c8ffb3f4a7a79447332be5162afba4e7fdbf62d4 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 13:42:43 2016 +0200
Subject: openprs: conditional use of unique_ptr

 src/plugins/openprs/mod_config.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/openprs/mod_config.cpp b/src/plugins/openprs/mod_config.cpp
index 8eaeb7d..0d8d351 100644
--- a/src/plugins/openprs/mod_config.cpp
+++ b/src/plugins/openprs/mod_config.cpp
@@ -44,7 +44,11 @@ action_config_load(TermList terms)
   ACTION_ASSERT_ARG_LENGTH("config-load", terms, 1);
   ACTION_SET_AND_ASSERT_ARG_TYPE("config-load", prefix, terms, 1, STRING);
 
+#if __cplusplus >= 201103L
   std::unique_ptr<Configuration::ValueIterator> v(g_config->search(prefix->u.string));
+#else
+  std::auto_ptr<Configuration::ValueIterator> v(g_config->search(prefix->u.string));
+#endif
   while (v->next()) {
     TermList tl = sl_make_slist();
     tl = build_term_list(tl, build_string(v->path()));

- *commit* ef5043ee4cb44a254ed4e1c03b47629a97b7d30a - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 13:44:21 2016 +0200
Subject: pcl-db: make C++11 or later mandatory requirement

 src/plugins/perception/pcl-db/Makefile |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/perception/pcl-db/Makefile b/src/plugins/perception/pcl-db/Makefile
index 2c30d9d..88269d3 100644
--- a/src/plugins/perception/pcl-db/Makefile
+++ b/src/plugins/perception/pcl-db/Makefile
@@ -54,8 +54,8 @@ OBJS_pcl_db_store = pcl_db_store_plugin.o pcl_db_store_thread.o
 OBJS_all    = $(OBJS_pcl_db_merge) $(OBJS_pcl_db_retrieve) $(OBJS_pcl_db_store)
 
 
-ifeq ($(HAVE_MONGODB)$(HAVE_PCL)$(HAVE_TF),111)
-  CFLAGS += $(CFLAGS_PCL) $(CFLAGS_TF) $(CFLAGS_MONGODB)
+ifeq ($(HAVE_MONGODB)$(HAVE_PCL)$(HAVE_TF)$(HAVE_CPP11),1111)
+  CFLAGS += $(CFLAGS_PCL) $(CFLAGS_TF) $(CFLAGS_MONGODB) $(CFLAGS_CPP11)
   LDFLAGS += $(LDFLAGS_PCL) $(LDFLAGS_TF) $(LDFLAGS_MONGODB)
 
   PLUGINS_all = $(PLUGINDIR)/pcl-db-store.so $(PLUGINDIR)/pcl-db-retrieve.so
@@ -81,6 +81,9 @@ else
   ifneq ($(HAVE_TF),1)
     WARN_TARGETS += warning_tf
   endif
+  ifneq ($(HAVE_CPP11),1)
+    WARN_TARGETS += warning_cpp11
+  endif
 endif
 
 ros: interfaces
@@ -89,7 +92,7 @@ ros: interfaces
 ifeq ($(OBJSSUBMAKE),1)
 all: $(WARN_TARGETS)
 
-.PHONY: warning_mongodb warning_pcl warning_pcl_components warning_tf
+.PHONY: warning_mongodb warning_pcl warning_pcl_components warning_tf warning_cpp11
 warning_mongodb:
 	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting MongoDB PCL plugins$(TNORMAL) (mongodb[-devel] not installed)"
 warning_pcl:
@@ -98,6 +101,8 @@ warning_pcl_components:
 	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting MongoDB PCL merge plugin$(TNORMAL) (missing PCL components: $(call pcl-missing-libs,$(REQUIRED_PCL_LIBS_MERGE)))"
 warning_tf:
 	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting MongoDB PCL merge plugin$(TNORMAL) (TF framework not available)"
+warning_cpp11:
+	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting MongoDB PCL merge plugin$(TNORMAL) (C++11 support required)"
 endif
 
 include $(BUILDSYSDIR)/base.mk

- *commit* 110a56c03389af4e1ddfb0ccd7cceaa92656f7de - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 13:45:01 2016 +0200
Subject: static-transforms: conditional use of unique_ptr

 .../static_transforms/static_transforms_thread.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/static_transforms/static_transforms_thread.cpp b/src/plugins/static_transforms/static_transforms_thread.cpp
index 5a23abe..edd1e33 100644
--- a/src/plugins/static_transforms/static_transforms_thread.cpp
+++ b/src/plugins/static_transforms/static_transforms_thread.cpp
@@ -78,7 +78,11 @@ StaticTransformsThread::entries_get_from_config()
   std::set<std::string> ignored_transforms;
 
   std::string prefix = CFG_PREFIX"transforms/";
+#if __cplusplus >= 201103L
   std::unique_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str()));
+#else
+  std::auto_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str()));
+#endif
   while (i->next()) {
     std::string cfg_name = std::string(i->path()).substr(prefix.length());
     cfg_name = cfg_name.substr(0, cfg_name.find("/"));

- *commit* 7c82d9a84a11c40ed762a986f09b863a7f277b0b - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 13:45:21 2016 +0200
Subject: webview-ptzcam: conditional use of unique_ptr

 .../webview-ptzcam/webview-ptzcam-thread.cpp       |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/webview-ptzcam/webview-ptzcam-thread.cpp b/src/plugins/webview-ptzcam/webview-ptzcam-thread.cpp
index 0e40cc3..a48fb64 100644
--- a/src/plugins/webview-ptzcam/webview-ptzcam-thread.cpp
+++ b/src/plugins/webview-ptzcam/webview-ptzcam-thread.cpp
@@ -87,7 +87,11 @@ WebviewPtzCamThread::init()
 
   std::map<std::string, std::tuple<std::string, float, float, unsigned int>> presets;
   std::string prefix = "/webview/ptzcam/presets/";
+#if __cplusplus >= 201103L
   std::unique_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str()));
+#else
+  std::auto_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str()));
+#endif
   while (i->next()) {
     std::string cfg_name = std::string(i->path()).substr(prefix.length());
     cfg_name = cfg_name.substr(0, cfg_name.find("/"));




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list