[Fawkes Git] branch/common/master-merge-review: 11 revs updated. (0.5.0-3316-gca77d93)

Till Hofmann hofmann at kbsg.rwth-aachen.de
Mon Sep 5 13:52:01 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  ca77d936f4afdf52ef548bb65758c3541aeefd4e (commit)
       via  f6cb7ea4ca0ee8d201c02303a422081dc83c8d20 (commit)
       via  354a1406b3e367e80b31e161ee64a1511dbebece (commit)
       via  5834e306ff44afd552ca0ec27ec558b808f6c348 (commit)
       via  6e2e7a2a6a187da5834161e23c16a12b163ef9f3 (commit)
       via  7df43d630132592db965a64fe7e0fd4e93f2294f (commit)
       via  3fa88c2913cfcc5853316cf7c0b90bca89a0f7af (commit)
       via  5d90b05b3f824aea7ba318b34521949c430edc87 (commit)
       via  0d3bb414dcdc91dfffa273207c6c6336b8170849 (commit)
       via  ff5340366ce14a734fd6608db4b7190ac5c0b00a (commit)
       via  25abdd646537ccc63d7371ecba4a0b6732dd413c (commit)
      from  8d9172137bac9199a2ef3a19b12b6b76322d6abe (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 25abdd646537ccc63d7371ecba4a0b6732dd413c
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:31:05 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:49:51 2016 +0200

    fvutils: only replace auto_ptrs if we use at least C++11
    
    Replacing auto_ptrs with unique_ptrs or shared_ptrs is only possible
    with C++11 because earlier versions don't support the new pointer types.

http://git.fawkesrobotics.org/fawkes.git/commit/25abdd6
http://trac.fawkesrobotics.org/changeset/25abdd6

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit ff5340366ce14a734fd6608db4b7190ac5c0b00a
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:40:56 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:49:51 2016 +0200

    bblogger: only replace auto_ptrs if we use at least C++11
    
    Replacing auto_ptrs with unique_ptrs or shared_ptrs is only possible
    with C++11 because earlier versions don't support the new pointer types.

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 0d3bb414dcdc91dfffa273207c6c6336b8170849
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:42:25 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:49:51 2016 +0200

    clips: only replace auto_ptrs if we use at least C++11
    
    Replacing auto_ptrs with unique_ptrs or shared_ptrs is only possible
    with C++11 because earlier versions don't support the new pointer types.

http://git.fawkesrobotics.org/fawkes.git/commit/0d3bb41
http://trac.fawkesrobotics.org/changeset/0d3bb41

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 5d90b05b3f824aea7ba318b34521949c430edc87
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:43:16 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:49:51 2016 +0200

    dynamixel: only replace auto_ptrs if we use at least C++11
    
    Replacing auto_ptrs with unique_ptrs or shared_ptrs is only possible
    with C++11 because earlier versions don't support the new pointer types.
    
    This reverts commit fe212150494dade7ed8d98259d1e0ddb23358b88.

http://git.fawkesrobotics.org/fawkes.git/commit/5d90b05
http://trac.fawkesrobotics.org/changeset/5d90b05

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 3fa88c2913cfcc5853316cf7c0b90bca89a0f7af
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:45:50 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:49:51 2016 +0200

    imu: only replace auto_ptrs if we use at least C++11
    
    Replacing auto_ptrs with unique_ptrs or shared_ptrs is only possible
    with C++11 because earlier versions don't support the new pointer types.

http://git.fawkesrobotics.org/fawkes.git/commit/3fa88c2
http://trac.fawkesrobotics.org/changeset/3fa88c2

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 7df43d630132592db965a64fe7e0fd4e93f2294f
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:47:34 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:49:51 2016 +0200

    laser-cluster: only replace auto_ptrs if we use at least C++11
    
    Replacing auto_ptrs with unique_ptrs or shared_ptrs is only possible
    with C++11 because earlier versions don't support the new pointer types.

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 6e2e7a2a6a187da5834161e23c16a12b163ef9f3
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:51:13 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:49:51 2016 +0200

    laser-filter: only replace auto_ptrs if we use at least C++11
    
    Replacing auto_ptrs with unique_ptrs or shared_ptrs is only possible
    with C++11 because earlier versions don't support the new pointer types.

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 5834e306ff44afd552ca0ec27ec558b808f6c348
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 12:55:53 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:49:51 2016 +0200

    laser: only replace auto_ptrs if we use at least C++11
    
    Replacing auto_ptrs with unique_ptrs or shared_ptrs is only possible
    with C++11 because earlier versions don't support the new pointer types.

http://git.fawkesrobotics.org/fawkes.git/commit/5834e30
http://trac.fawkesrobotics.org/changeset/5834e30

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 354a1406b3e367e80b31e161ee64a1511dbebece
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 13:30:18 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:49:51 2016 +0200

    mongodb: only replace auto_ptrs if we use at least C++11
    
    Replacing auto_ptrs with unique_ptrs or shared_ptrs is only possible
    with C++11 because earlier versions don't support the new pointer types.

http://git.fawkesrobotics.org/fawkes.git/commit/354a140
http://trac.fawkesrobotics.org/changeset/354a140

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit f6cb7ea4ca0ee8d201c02303a422081dc83c8d20
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 13:31:23 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:49:51 2016 +0200

    mongodb_log: only replace auto_ptrs if we use at least C++11
    
    Replacing auto_ptrs with unique_ptrs or shared_ptrs is only possible
    with C++11 because earlier versions don't support the new pointer types.

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit ca77d936f4afdf52ef548bb65758c3541aeefd4e
Author:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 13:35:54 2016 +0200
Commit:     Till Hofmann <hofmann at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 13:49:51 2016 +0200

    openni: only replace auto_ptrs if we use at least C++11
    
    Replacing auto_ptrs with unique_ptrs or shared_ptrs is only possible
    with C++11 because earlier versions don't support the new pointer types.

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

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


- *Summary* -----------------------------------------------------------
 src/libs/fvutils/ipc/shm_image.cpp                 |    7 +++++++
 src/plugins/bblogger/bblogreplay_plugin.cpp        |    4 ++++
 src/plugins/clips/feature_config.cpp               |    5 +++++
 src/plugins/dynamixel/dynamixel_plugin.cpp         |    4 ++++
 src/plugins/imu/imu_plugin.cpp                     |    2 +-
 src/plugins/laser-cluster/laser-cluster-plugin.cpp |    4 ++++
 src/plugins/laser-filter/filter_thread.cpp         |    9 +++++++++
 src/plugins/laser-filter/laser_filter_plugin.cpp   |   12 ++++++++++++
 src/plugins/laser/laser_plugin.cpp                 |    4 ++++
 src/plugins/laser/urg_aqt.cpp                      |    4 ++++
 src/plugins/laser/urg_gbx_aqt.cpp                  |    8 ++++++++
 src/plugins/mongodb/mongodb_thread.cpp             |    6 +++---
 .../mongodb_log/tools/ffmongodb_save_imgs.cpp      |    5 +++++
 src/plugins/openni/depth_thread.cpp                |    4 ++++
 src/plugins/openni/handtracker_thread.cpp          |   11 ++++++++---
 src/plugins/openni/image_thread.cpp                |    4 ++++
 src/plugins/openni/pointcloud_thread.cpp           |    8 +++++++-
 17 files changed, 93 insertions(+), 8 deletions(-)


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

- *commit* 25abdd646537ccc63d7371ecba4a0b6732dd413c - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:31:05 2016 +0200
Subject: fvutils: only replace auto_ptrs if we use at least C++11

 src/libs/fvutils/ipc/shm_image.cpp |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/fvutils/ipc/shm_image.cpp b/src/libs/fvutils/ipc/shm_image.cpp
index b401e92..4cd9122 100644
--- a/src/libs/fvutils/ipc/shm_image.cpp
+++ b/src/libs/fvutils/ipc/shm_image.cpp
@@ -506,10 +506,17 @@ SharedMemoryImageBuffer::list()
 std::list<SharedMemoryImageBufferMetaData>
 SharedMemoryImageBuffer::list_meta_data()
 {
+#if __cplusplus >= 201103L
   std::unique_ptr<SharedMemoryImageBufferMetaDataCollector>
     lister(new SharedMemoryImageBufferMetaDataCollector());
   std::unique_ptr<SharedMemoryImageBufferHeader>
     h(new SharedMemoryImageBufferHeader());
+#else
+  std::auto_ptr<SharedMemoryImageBufferMetaDataCollector>
+    lister(new SharedMemoryImageBufferMetaDataCollector());
+  std::auto_ptr<SharedMemoryImageBufferHeader>
+    h(new SharedMemoryImageBufferHeader());
+#endif
 
   SharedMemory::list(FIREVISION_SHM_IMAGE_MAGIC_TOKEN, h.get(), lister.get());
   return lister->meta_data();

- *commit* ff5340366ce14a734fd6608db4b7190ac5c0b00a - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:40:56 2016 +0200
Subject: bblogger: only replace auto_ptrs if we use at least C++11

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

_Diff for modified files_:
diff --git a/src/plugins/bblogger/bblogreplay_plugin.cpp b/src/plugins/bblogger/bblogreplay_plugin.cpp
index 0ce3a11..014bd01 100644
--- a/src/plugins/bblogger/bblogreplay_plugin.cpp
+++ b/src/plugins/bblogger/bblogreplay_plugin.cpp
@@ -103,7 +103,11 @@ BlackBoardLogReplayPlugin::BlackBoardLogReplayPlugin(Configuration *config)
     scenario_grace_period = config->get_float((scenario_prefix + "grace_period").c_str());
   } catch (Exception &e) {} // ignored, assume enabled
 
+#if __cplusplus >= 201103L
   std::unique_ptr<Configuration::ValueIterator> i(config->search(logs_prefix.c_str()));
+#else
+  std::auto_ptr<Configuration::ValueIterator> i(config->search(logs_prefix.c_str()));
+#endif
   while (i->next()) {
     std::string log_name = std::string(i->path()).substr(logs_prefix.length());
     log_name = log_name.substr(0, log_name.find("/"));

- *commit* 0d3bb414dcdc91dfffa273207c6c6336b8170849 - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:42:25 2016 +0200
Subject: clips: only replace auto_ptrs if we use at least C++11

 src/plugins/clips/feature_config.cpp |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/clips/feature_config.cpp b/src/plugins/clips/feature_config.cpp
index 36827d7..ee26399 100644
--- a/src/plugins/clips/feature_config.cpp
+++ b/src/plugins/clips/feature_config.cpp
@@ -86,7 +86,12 @@ ConfigCLIPSFeature::clips_config_load(std::string env_name, std::string cfg_pref
   }
 
   fawkes::MutexLocker lock(envs_[env_name].objmutex_ptr());
+#if __cplusplus >= 201103L
   std::unique_ptr<Configuration::ValueIterator> v(config_->search(cfg_prefix.c_str()));
+#else
+  std::auto_ptr<Configuration::ValueIterator> v(config_->search(cfg_prefix.c_str()));
+#endif
+
   while (v->next()) {
     std::string type = "";
     std::string value = v->get_as_string();

- *commit* 5d90b05b3f824aea7ba318b34521949c430edc87 - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:43:16 2016 +0200
Subject: dynamixel: only replace auto_ptrs if we use at least C++11

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

_Diff for modified files_:
diff --git a/src/plugins/dynamixel/dynamixel_plugin.cpp b/src/plugins/dynamixel/dynamixel_plugin.cpp
index 505ca5b..4493eeb 100644
--- a/src/plugins/dynamixel/dynamixel_plugin.cpp
+++ b/src/plugins/dynamixel/dynamixel_plugin.cpp
@@ -51,7 +51,11 @@ class DynamixelPlugin : public fawkes::Plugin
     std::string prefix = "/dynamixel/";
 
     // Read configurations and spawn LaserFilterThreads
+#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* 3fa88c2913cfcc5853316cf7c0b90bca89a0f7af - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:45:50 2016 +0200
Subject: imu: only replace auto_ptrs if we use at least C++11

 src/plugins/imu/imu_plugin.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/imu/imu_plugin.cpp b/src/plugins/imu/imu_plugin.cpp
index 88e5f40..20f6272 100644
--- a/src/plugins/imu/imu_plugin.cpp
+++ b/src/plugins/imu/imu_plugin.cpp
@@ -52,7 +52,7 @@ class IMUPlugin : public fawkes::Plugin
 #if __cplusplus >= 201103L
     std::unique_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str()));
 #else
-    std::unique_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str()));
+    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());

- *commit* 7df43d630132592db965a64fe7e0fd4e93f2294f - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:47:34 2016 +0200
Subject: laser-cluster: only replace auto_ptrs if we use at least C++11

 src/plugins/laser-cluster/laser-cluster-plugin.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/laser-cluster/laser-cluster-plugin.cpp b/src/plugins/laser-cluster/laser-cluster-plugin.cpp
index b49dcae..e33bc65 100644
--- a/src/plugins/laser-cluster/laser-cluster-plugin.cpp
+++ b/src/plugins/laser-cluster/laser-cluster-plugin.cpp
@@ -45,7 +45,11 @@ class LaserClusterPlugin : public fawkes::Plugin
     std::string prefix = "/laser-cluster/";
 
     // Read configurations and spawn LaserFilterThreads
+#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* 6e2e7a2a6a187da5834161e23c16a12b163ef9f3 - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:51:13 2016 +0200
Subject: laser-filter: only replace auto_ptrs if we use at least C++11

 src/plugins/laser-filter/filter_thread.cpp       |    9 +++++++++
 src/plugins/laser-filter/laser_filter_plugin.cpp |   12 ++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/laser-filter/filter_thread.cpp b/src/plugins/laser-filter/filter_thread.cpp
index 5e26a71..e13ed9f 100644
--- a/src/plugins/laser-filter/filter_thread.cpp
+++ b/src/plugins/laser-filter/filter_thread.cpp
@@ -93,7 +93,12 @@ LaserFilterThread::init()
     std::map<std::string, std::string> filters;
 
     std::string fpfx = __cfg_prefix + "filters/";
+#if __cplusplus >= 201103L
     std::unique_ptr<Configuration::ValueIterator> i(config->search(fpfx.c_str()));
+#else
+    std::auto_ptr<Configuration::ValueIterator> i(config->search(fpfx.c_str()));
+#endif
+
     while (i->next()) {
       
       std::string suffix = std::string(i->path()).substr(fpfx.length());
@@ -271,7 +276,11 @@ LaserFilterThread::open_interfaces(std::string prefix,
 				   std::vector<LaserInterface> &ifs,
 				   std::vector<LaserDataFilter::Buffer *> &bufs, bool writing)
 {
+#if __cplusplus >= 201103L
   std::unique_ptr<Configuration::ValueIterator> in(config->search(prefix.c_str()));
+#else
+  std::auto_ptr<Configuration::ValueIterator> in(config->search(prefix.c_str()));
+#endif
   while (in->next()) {
     if (! in->is_string()) {
       throw Exception("Config value %s is not of type string", in->path());
diff --git a/src/plugins/laser-filter/laser_filter_plugin.cpp b/src/plugins/laser-filter/laser_filter_plugin.cpp
index 12b9dd6..189db51 100644
--- a/src/plugins/laser-filter/laser_filter_plugin.cpp
+++ b/src/plugins/laser-filter/laser_filter_plugin.cpp
@@ -54,7 +54,11 @@ LaserFilterPlugin::LaserFilterPlugin(Configuration *config)
   std::string prefix = "/plugins/laser-filter/";
 
   // Read configurations and spawn LaserFilterThreads
+#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("/"));
@@ -102,7 +106,11 @@ LaserFilterPlugin::LaserFilterPlugin(Configuration *config)
   for (c = configs.begin(); c != configs.end(); ++c) {
     std::string cinp = prefix + *c + "/in/";
     std::list<std::string> cinputs;
+#if __cplusplus >= 201103L
     std::unique_ptr<Configuration::ValueIterator> in(config->search(cinp.c_str()));
+#else
+    std::auto_ptr<Configuration::ValueIterator> in(config->search(cinp.c_str()));
+#endif
     while (in->next()) {
       if (in->is_string()) {
 	cinputs.push_back(in->get_string());
@@ -111,7 +119,11 @@ LaserFilterPlugin::LaserFilterPlugin(Configuration *config)
 
     std::string coutp = prefix + *c + "/out/";
     std::list<std::string> coutputs;
+#if __cplusplus >= 201103L
     std::unique_ptr<Configuration::ValueIterator> out(config->search(coutp.c_str()));
+#else
+    std::auto_ptr<Configuration::ValueIterator> out(config->search(coutp.c_str()));
+#endif
     while (out->next()) {
       if (out->is_string()) {
 	coutputs.push_back(out->get_string());

- *commit* 5834e306ff44afd552ca0ec27ec558b808f6c348 - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 12:55:53 2016 +0200
Subject: laser: only replace auto_ptrs if we use at least C++11

 src/plugins/laser/laser_plugin.cpp |    4 ++++
 src/plugins/laser/urg_aqt.cpp      |    4 ++++
 src/plugins/laser/urg_gbx_aqt.cpp  |    8 ++++++++
 3 files changed, 16 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/laser/laser_plugin.cpp b/src/plugins/laser/laser_plugin.cpp
index f5f7c31..a5d098c 100644
--- a/src/plugins/laser/laser_plugin.cpp
+++ b/src/plugins/laser/laser_plugin.cpp
@@ -62,7 +62,11 @@ LaserPlugin::LaserPlugin(Configuration *config)
 
   std::string prefix = "/hardware/laser/";
 
+#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("/"));
diff --git a/src/plugins/laser/urg_aqt.cpp b/src/plugins/laser/urg_aqt.cpp
index 9fcb9a8..837959c 100644
--- a/src/plugins/laser/urg_aqt.cpp
+++ b/src/plugins/laser/urg_aqt.cpp
@@ -205,7 +205,11 @@ HokuyoUrgAcquisitionThread::init()
 #endif
 
   __ctrl = new UrgCtrl();
+#if __cplusplus >= 201103L
   std::unique_ptr<UrgCtrl> ctrl(__ctrl);
+#else
+  std::auto_ptr<UrgCtrl> ctrl(__ctrl);
+#endif
   __fd = open(__cfg_device.c_str(), 0, O_RDONLY);
   if (__fd == -1) {
     throw Exception(errno, "Failed to open URG device %s", __cfg_device.c_str());
diff --git a/src/plugins/laser/urg_gbx_aqt.cpp b/src/plugins/laser/urg_gbx_aqt.cpp
index b3de7ae..946044b 100644
--- a/src/plugins/laser/urg_gbx_aqt.cpp
+++ b/src/plugins/laser/urg_gbx_aqt.cpp
@@ -88,10 +88,18 @@ HokuyoUrgGbxAcquisitionThread::init()
 
 #ifdef HAVE_URG_GBX_9_11
   __laser = new HokuyoLaser();
+#if __cplusplus >= 201103L
   std::unique_ptr<HokuyoLaser> laser(__laser);
 #else
+  std::auto_ptr<HokuyoLaser> laser(__laser);
+#endif
+#else
   __laser = new Sensor();
+#if __cplusplus >= 201103L
   std::unique_ptr<Sensor> laser(__laser);
+#else
+  std::auto_ptr<Sensor> laser(__laser);
+#endif
 #endif
   std::string port_options = "type=serial,device=" + __cfg_device + ",timeout=1";
   try {

- *commit* 354a1406b3e367e80b31e161ee64a1511dbebece - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 13:30:18 2016 +0200
Subject: mongodb: only replace auto_ptrs if we use at least C++11

 src/plugins/mongodb/mongodb_thread.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/mongodb/mongodb_thread.cpp b/src/plugins/mongodb/mongodb_thread.cpp
index b38f493..081fd18 100644
--- a/src/plugins/mongodb/mongodb_thread.cpp
+++ b/src/plugins/mongodb/mongodb_thread.cpp
@@ -113,7 +113,7 @@ MongoDBThread::init()
 #if __cplusplus >= 201103L || (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ >= 4)
   std::unique_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str()));
 #else
-  std::unique_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str()));
+  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());
@@ -217,7 +217,7 @@ MongoDBThread::ClientConf::read_authinfo(Configuration *config, Logger *logger,
 #if __cplusplus >= 201103L
   std::unique_ptr<Configuration::ValueIterator>
 #else
-  std::unique_ptr<Configuration::ValueIterator>
+  std::auto_ptr<Configuration::ValueIterator>
 #endif
     i(config->search((prefix + "auth/").c_str()));
   while (i->next()) {
@@ -271,7 +271,7 @@ MongoDBThread::ClientConf::ClientConf(Configuration *config, Logger *logger,
 #if __cplusplus >= 201103L || (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ >= 4)
     std::unique_ptr<Configuration::ValueIterator>
 #else
-    std::unique_ptr<Configuration::ValueIterator>
+    std::auto_ptr<Configuration::ValueIterator>
 #endif
       i(config->search((prefix + "hosts/").c_str()));
     while (i->next()) {

- *commit* f6cb7ea4ca0ee8d201c02303a422081dc83c8d20 - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 13:31:23 2016 +0200
Subject: mongodb_log: only replace auto_ptrs if we use at least C++11

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

_Diff for modified files_:
diff --git a/src/plugins/mongodb_log/tools/ffmongodb_save_imgs.cpp b/src/plugins/mongodb_log/tools/ffmongodb_save_imgs.cpp
index 11dd3b2..3644a08 100644
--- a/src/plugins/mongodb_log/tools/ffmongodb_save_imgs.cpp
+++ b/src/plugins/mongodb_log/tools/ffmongodb_save_imgs.cpp
@@ -136,8 +136,13 @@ main(int argc, char **argv)
 	.sort("timestamp", 1);
     }
 
+#if __cplusplus >= 201103L
     std::unique_ptr<mongo::DBClientCursor> cursor =
       mongodb_client->query(query_coll, q);
+#else
+    std::auto_ptr<mongo::DBClientCursor> cursor =
+      mongodb_client->query(query_coll, q);
+#endif
 
     while (cursor->more()) {
       BSONObj doc = cursor->next();

- *commit* ca77d936f4afdf52ef548bb65758c3541aeefd4e - - - - - - - - - -
Author:  Till Hofmann <hofmann at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 13:35:54 2016 +0200
Subject: openni: only replace auto_ptrs if we use at least C++11

 src/plugins/openni/depth_thread.cpp       |    4 ++++
 src/plugins/openni/handtracker_thread.cpp |   11 ++++++++---
 src/plugins/openni/image_thread.cpp       |    4 ++++
 src/plugins/openni/pointcloud_thread.cpp  |    8 +++++++-
 4 files changed, 23 insertions(+), 4 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/openni/depth_thread.cpp b/src/plugins/openni/depth_thread.cpp
index 0e70b01..947442a 100644
--- a/src/plugins/openni/depth_thread.cpp
+++ b/src/plugins/openni/depth_thread.cpp
@@ -60,7 +60,11 @@ OpenNiDepthThread::init()
   MutexLocker lock(openni.objmutex_ptr());
 
   __depth_gen = new xn::DepthGenerator();
+#if __cplusplus >= 201103L
   std::unique_ptr<xn::DepthGenerator> depthgen_uniqueptr(__depth_gen);
+#else
+  std::auto_ptr<xn::DepthGenerator> depthgen_uniqueptr(__depth_gen);
+#endif
 
   XnStatus st;
 
diff --git a/src/plugins/openni/handtracker_thread.cpp b/src/plugins/openni/handtracker_thread.cpp
index 73e375a..044bf7b 100644
--- a/src/plugins/openni/handtracker_thread.cpp
+++ b/src/plugins/openni/handtracker_thread.cpp
@@ -103,13 +103,18 @@ OpenNiHandTrackerThread::init()
   MutexLocker lock(openni.objmutex_ptr());
 
   __hand_gen = new xn::HandsGenerator();
+#if __cplusplus >= 201103L
   std::unique_ptr<xn::HandsGenerator> handgen_uniqueptr(__hand_gen);
-
-  __gesture_gen = new xn::GestureGenerator();
   std::unique_ptr<xn::GestureGenerator> gesturegen_uniqueptr(__gesture_gen);
+  std::unique_ptr<xn::DepthGenerator> depthgen_uniqueptr(__depth_gen);
+#else
+  std::auto_ptr<xn::HandsGenerator> handgen_uniqueptr(__hand_gen);
+  std::auto_ptr<xn::GestureGenerator> gesturegen_uniqueptr(__gesture_gen);
+  std::auto_ptr<xn::DepthGenerator> depthgen_uniqueptr(__depth_gen);
+#endif
 
+  __gesture_gen = new xn::GestureGenerator();
   __depth_gen = new xn::DepthGenerator();
-  std::unique_ptr<xn::DepthGenerator> depthgen_uniqueptr(__depth_gen);
 
   XnStatus st;
 
diff --git a/src/plugins/openni/image_thread.cpp b/src/plugins/openni/image_thread.cpp
index 1f84b8a..a85646a 100644
--- a/src/plugins/openni/image_thread.cpp
+++ b/src/plugins/openni/image_thread.cpp
@@ -66,7 +66,11 @@ OpenNiImageThread::init()
   __cfg_copy_mode = CONVERT_YUV;
 
   __image_gen = new xn::ImageGenerator();
+#if __cplusplus >= 201103L
   std::unique_ptr<xn::ImageGenerator> imagegen_uniqueptr(__image_gen);
+#else
+  std::auto_ptr<xn::ImageGenerator> imagegen_uniqueptr(__image_gen);
+#endif
 
   XnStatus st;
 
diff --git a/src/plugins/openni/pointcloud_thread.cpp b/src/plugins/openni/pointcloud_thread.cpp
index 9ccfa2e..4841378 100644
--- a/src/plugins/openni/pointcloud_thread.cpp
+++ b/src/plugins/openni/pointcloud_thread.cpp
@@ -72,9 +72,15 @@ OpenNiPointCloudThread::init()
   __image_rgb_buf = NULL;
 
   __depth_gen = new xn::DepthGenerator();
+#if __cplusplus >= 201103L
   std::unique_ptr<xn::DepthGenerator> depthgen_uniqueptr(__depth_gen);
-  __image_gen = new xn::ImageGenerator();
   std::unique_ptr<xn::ImageGenerator> imagegen_uniqueptr(__image_gen);
+#else
+  std::auto_ptr<xn::DepthGenerator> depthgen_uniqueptr(__depth_gen);
+  std::auto_ptr<xn::ImageGenerator> imagegen_uniqueptr(__image_gen);
+#endif
+
+  __image_gen = new xn::ImageGenerator();
 
   XnStatus st;
 




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


More information about the fawkes-commits mailing list