[Fawkes Git] branch/common/master-merge-review: 2 revs updated. (0.5.0-3331-g6590aa9)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Mon Sep 5 15:18:31 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  6590aa9efeffef18b51fb3438bb79c2d5afeacf4 (commit)
       via  8e6583944af48a528abfa0da63dc593215712c59 (commit)
      from  7c82d9a84a11c40ed762a986f09b863a7f277b0b (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 8e6583944af48a528abfa0da63dc593215712c59
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 15:17:11 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 15:18:17 2016 +0200

    mongodb: update compile and link flags for FreeBSD

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 6590aa9efeffef18b51fb3438bb79c2d5afeacf4
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 15:17:36 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 15:18:17 2016 +0200

    skiller: remove unused member variables of exec thread
    
    Clang found this.

http://git.fawkesrobotics.org/fawkes.git/commit/6590aa9
http://trac.fawkesrobotics.org/changeset/6590aa9

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


- *Summary* -----------------------------------------------------------
 src/plugins/mongodb/mongodb.mk    |    4 ++++
 src/plugins/skiller/exec_thread.h |    3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)


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

- *commit* 8e6583944af48a528abfa0da63dc593215712c59 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 15:17:11 2016 +0200
Subject: mongodb: update compile and link flags for FreeBSD

 src/plugins/mongodb/mongodb.mk |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/mongodb/mongodb.mk b/src/plugins/mongodb/mongodb.mk
index bde0fc9..e759cdf 100644
--- a/src/plugins/mongodb/mongodb.mk
+++ b/src/plugins/mongodb/mongodb.mk
@@ -36,6 +36,10 @@ ifneq ($(wildcard /usr/include/mongo/client/dbclient.h /usr/local/include/mongo/
     ifeq ($(DISTRO),ubuntu)
       LDFLAGS_MONGODB += -lssl -lcrypto
     endif
+    ifeq ($(OS),FreeBSD)
+      CFLAGS_MONGODB  += -Wno-deprecated-declarations
+      LDFLAGS_MONGODB += -lssl -lcrypto -lsasl2
+    endif
   endif
 endif
 

- *commit* 6590aa9efeffef18b51fb3438bb79c2d5afeacf4 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 15:17:36 2016 +0200
Subject: skiller: remove unused member variables of exec thread

 src/plugins/skiller/exec_thread.h |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/skiller/exec_thread.h b/src/plugins/skiller/exec_thread.h
index c3a4a49..c3f7dcf 100644
--- a/src/plugins/skiller/exec_thread.h
+++ b/src/plugins/skiller/exec_thread.h
@@ -92,9 +92,6 @@ class SkillerExecutionThread
   fawkes::ComponentLogger *__clog;
   fawkes::BlackBoardWithOwnership *__bbo;
   
-  unsigned int __last_exclusive_controller;
-  bool         __reader_just_left;
-
   // config values
   std::string __cfg_skillspace;
   bool        __cfg_watch_files;




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


More information about the fawkes-commits mailing list