[Fawkes Git] branch/common/master-merge-review: 3 revs updated. (0.5.0-3341-ge709aba)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Mon Sep 5 17:25:13 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  e709aba74e9081d82096ac2e22ac1552feb88618 (commit)
       via  939f899669e439724c2043f337109cc363ede756 (commit)
       via  96e86df3eab96b92d51a947834c4ba6386a9adf8 (commit)
      from  93a6598286f29e6a97c249d4749f0aa8fdc7674a (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 96e86df3eab96b92d51a947834c4ba6386a9adf8
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 17:22:02 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 17:22:02 2016 +0200

    buildsys: fix boost version comparison macros
    
    The divider for the minor version was 1000 instead of 100 resulting in
    wrong checks.

http://git.fawkesrobotics.org/fawkes.git/commit/96e86df
http://trac.fawkesrobotics.org/changeset/96e86df

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 939f899669e439724c2043f337109cc363ede756
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 17:23:43 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 17:23:43 2016 +0200

    pcl-db: revive more auto_ptr
    
    The MongoDB API itself uses auto_ptr. It's just handled gracefully in
    the newer C++ mode as it seems. Create a guarded version which works for
    both cases.

http://git.fawkesrobotics.org/fawkes.git/commit/939f899
http://trac.fawkesrobotics.org/changeset/939f899

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit e709aba74e9081d82096ac2e22ac1552feb88618
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 17:24:30 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 17:24:30 2016 +0200

    robotino: fix Boost version check
    
    Arguments were given in the wrong order.

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

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


- *Summary* -----------------------------------------------------------
 etc/buildsys/boost.mk                              |    5 +++--
 .../perception/pcl-db/mongodb_tf_transformer.cpp   |    4 ++++
 src/plugins/perception/pcl-db/pcl_db_pipeline.h    |    8 ++++++++
 src/plugins/robotino/Makefile                      |   12 ++++++------
 4 files changed, 21 insertions(+), 8 deletions(-)


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

- *commit* 96e86df3eab96b92d51a947834c4ba6386a9adf8 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 17:22:02 2016 +0200
Subject: buildsys: fix boost version comparison macros

 etc/buildsys/boost.mk |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

_Diff for modified files_:
diff --git a/etc/buildsys/boost.mk b/etc/buildsys/boost.mk
index 309e00d..3317dee 100644
--- a/etc/buildsys/boost.mk
+++ b/etc/buildsys/boost.mk
@@ -45,7 +45,8 @@ ifeq ($(call boost-have-include,version.hpp),1)
   BOOST_VERSION_PATCH = $(shell echo $$(($(BOOST_VERSION) % 100)))
 endif
 
-boost-version-create = $(shell echo $$(($1 * 100000 + $2 * 1000 + $3)))
-boost-version-atleast = $(shell echo $$(($(BOOST_VERSION) >= $1 * 100000 + $2 * 1000 + $3)))
+boost-version-create = $(shell echo $$(($1 * 100000 + $2 * 100 + $3)))
+boost-version-atleast = $(shell echo $$(($(BOOST_VERSION) >= $1 * 100000 + $2 * 100 + $3)))
+boost-version-parse  = $(shell echo $$(($1 / 100000)).$$(($1 / 100 % 1000)).$$(($1 % 100)))
 
 endif # __buildsys_boost_mk_

- *commit* 939f899669e439724c2043f337109cc363ede756 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 17:23:43 2016 +0200
Subject: pcl-db: revive more auto_ptr

 .../perception/pcl-db/mongodb_tf_transformer.cpp   |    4 ++++
 src/plugins/perception/pcl-db/pcl_db_pipeline.h    |    8 ++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/perception/pcl-db/mongodb_tf_transformer.cpp b/src/plugins/perception/pcl-db/mongodb_tf_transformer.cpp
index 61a389f..441ef20 100644
--- a/src/plugins/perception/pcl-db/mongodb_tf_transformer.cpp
+++ b/src/plugins/perception/pcl-db/mongodb_tf_transformer.cpp
@@ -132,7 +132,11 @@ MongoDBTransformer::restore(long long start_msec, long long end_msec, long long
   std::list<std::string> collections =
     mongodb_client_->getCollectionNames(database_);
   
+#if __cplusplus >= 201103L
   std::unique_ptr<DBClientCursor> cursor;
+#else
+  std::auto_ptr<DBClientCursor> cursor;
+#endif
   BSONObj doc;
   std::list<std::string>::iterator c;
   for (c = collections.begin(); c != collections.end(); ++c) {
diff --git a/src/plugins/perception/pcl-db/pcl_db_pipeline.h b/src/plugins/perception/pcl-db/pcl_db_pipeline.h
index 1736bf2..74bd557 100644
--- a/src/plugins/perception/pcl-db/pcl_db_pipeline.h
+++ b/src/plugins/perception/pcl-db/pcl_db_pipeline.h
@@ -159,7 +159,11 @@ class PointCloudDBPipeline
     std::string fq_collection = database + "." + collection;
     try {
       for (unsigned int i = 0; i < num_clouds; ++i) {
+#if __cplusplus >= 201103L
 	std::unique_ptr<mongo::DBClientCursor> cursor =
+#else
+	std::auto_ptr<mongo::DBClientCursor> cursor =
+#endif
 	  mongodb_client_->query(fq_collection,
 				 QUERY("timestamp" << mongo::LTE << times[i]
                            << mongo::GTE << (times[i] - cfg_pcl_age_tolerance_))
@@ -277,7 +281,11 @@ class PointCloudDBPipeline
     // retrieve point clouds
     for (unsigned int i = 0; i < num_clouds; ++i) {
 
+#if __cplusplus >= 201103L
       std::unique_ptr<mongo::DBClientCursor> cursor =
+#else
+      std::auto_ptr<mongo::DBClientCursor> cursor =
+#endif
 	mongodb_client_->query(database + "." + collection,
 			       QUERY("timestamp" << mongo::LTE << times[i]
                                << mongo::GTE << (times[i] - cfg_pcl_age_tolerance_))

- *commit* e709aba74e9081d82096ac2e22ac1552feb88618 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 17:24:30 2016 +0200
Subject: robotino: fix Boost version check

 src/plugins/robotino/Makefile |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/robotino/Makefile b/src/plugins/robotino/Makefile
index a8fc65e..486d0a1 100644
--- a/src/plugins/robotino/Makefile
+++ b/src/plugins/robotino/Makefile
@@ -50,7 +50,7 @@ else
   WARN_TARGETS += warning_openrobotino
 endif
 
-ifeq ($(HAVE_LIBUDEV)$(HAVE_ROBOTINO_DIRECT_BOOST_LIBS)$(call boost-version-atleast,1,0,48),111)
+ifeq ($(HAVE_LIBUDEV)$(HAVE_ROBOTINO_DIRECT_BOOST_LIBS)$(call boost-version-atleast,1,48,0),111)
 	HAVE_ROBOTINO_DIRECT = 1
 
   CFLAGS += -DHAVE_ROBOTINO_DIRECT $(CFLAGS_CPP11) $(CFLAGS_LIBUDEV) $(CFLAGS_ROBOTINO_DIRECT_BOOST)
@@ -65,7 +65,7 @@ else
     WARN_TARGETS_ROBOTINO_DIRECT_BOOST = $(foreach l,$(ROBOTINO_DIRECT_REQ_BOOST_LIBS),$(if $(call boost-have-lib,$l),, warning_robotino_direct_boost_$l))
 	  WARN_TARGETS += $(WARN_TARGETS_ROBOTINO_DIRECT_BOOST)
   endif
-  ifneq ($(call boost-version-atleast,1,0,48),1)
+  ifneq ($(call boost-version-atleast,1,48,0),1)
     WARN_TARGETS += warning_old_boost
   endif
 endif
@@ -138,13 +138,13 @@ warning_ros:
 warning_sensor_msgs:
 	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TBROWN)Omitting Robotino Joints plugin$(TNORMAL) (ROS package sensor_msgs not found)"
 warning_libudev:
-	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct commnunication support$(TNORMAL) (libudev not available)"
+	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct communication support$(TNORMAL) (libudev not available)"
 $(WARN_TARGETS_ROBOTINO_DIRECT_BOOST): warning_robotino_direct_boost_%:
-	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct commnunication support$(TNORMAL) (Boost library $* not found)"
+	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct communication support$(TNORMAL) (Boost library $* not found)"
 warning_old_boost:
-	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct commnunication support$(TNORMAL) (Boost library too old, require at least 1.0.48, have $(BOOST_VERSION))"
+	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct communication support$(TNORMAL) (Boost library too old, require at least 1.0.48, have $(call boost-version-parse,$(BOOST_VERSION)))"
 warning_cpp11:
-	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct commnunication support$(TNORMAL) (C++11 support required)"
+	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct communication support$(TNORMAL) (C++11 support required)"
 endif
 
 include $(BUILDSYSDIR)/base.mk




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


More information about the fawkes-commits mailing list