[Fawkes Git] branch/timn/freebsd-fixes: 3 revs updated. (0.5.0-3471-ga97bf3a)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Thu Dec 22 21:42:57 CET 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, timn/freebsd-fixes has been updated
  discards  04dc8d6ec56db636905a90dd48bdedf353458270 (commit)
  discards  66682355753e248a66c628f2884f14047feb539c (commit)
  discards  ad96d9f0940f3ad5d6deb7ffc10d13bfc145eb7f (commit)
        to  a97bf3a0a6240406f54e50be9b5b42de0346b0bc (commit)
       via  b1898c77e1da35a66c60d2044348504c469e170f (commit)
       via  0e5d5ed86a30f2adabbe0a7168d8dfebb2267074 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (04dc8d6ec56db636905a90dd48bdedf353458270)
            \
             N -- N -- N (a97bf3a0a6240406f54e50be9b5b42de0346b0bc)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

http://git.fawkesrobotics.org/fawkes.git/timn/freebsd-fixes

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 0e5d5ed86a30f2adabbe0a7168d8dfebb2267074
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Dec 22 21:28:55 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Dec 22 21:42:40 2016 +0100

    netcomm: fix ambiguous template parameter name
    
    The template parameter conflicted with a new enum type name.

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit b1898c77e1da35a66c60d2044348504c469e170f
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Dec 22 21:29:25 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Dec 22 21:42:40 2016 +0100

    netcomm: add missing include for clang/libc++

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

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit a97bf3a0a6240406f54e50be9b5b42de0346b0bc
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Thu Dec 22 21:29:39 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Thu Dec 22 21:42:41 2016 +0100

    amcl: fix ambiguous use of std::abs with clang/libc++

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

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


- *Summary* -----------------------------------------------------------
 src/libs/netcomm/socket/socket.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


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

- *commit* 0e5d5ed86a30f2adabbe0a7168d8dfebb2267074 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Dec 22 21:28:55 2016 +0100
Subject: netcomm: fix ambiguous template parameter name

 src/libs/netcomm/socket/socket.h |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/netcomm/socket/socket.h b/src/libs/netcomm/socket/socket.h
index 234bc40..afe915b 100644
--- a/src/libs/netcomm/socket/socket.h
+++ b/src/libs/netcomm/socket/socket.h
@@ -129,8 +129,8 @@ class Socket
    * the given type.
    * @return socket to client
    */
-  template <class SocketType>
-    SocketType *     accept();
+  template <class SocketTypeC>
+    SocketTypeC *     accept();
 
  protected:
   Socket(SocketType sock_type, float timeout = 0.f);
@@ -153,12 +153,12 @@ class Socket
 };
 
 
-template <class SocketType>
-SocketType *
+template <class SocketTypeC>
+SocketTypeC *
 Socket::accept()
 {
   Socket *s = accept();
-  if (SocketType *ts = dynamic_cast<SocketType *>(s)) {
+  if (SocketTypeC *ts = dynamic_cast<SocketTypeC *>(s)) {
     return ts;
   } else {
     delete s;

- *commit* b1898c77e1da35a66c60d2044348504c469e170f - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Dec 22 21:29:25 2016 +0100
Subject: netcomm: add missing include for clang/libc++

 src/libs/netcomm/utils/resolver_thread.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/libs/netcomm/utils/resolver_thread.h b/src/libs/netcomm/utils/resolver_thread.h
index 17f8d80..7c75383 100644
--- a/src/libs/netcomm/utils/resolver_thread.h
+++ b/src/libs/netcomm/utils/resolver_thread.h
@@ -35,6 +35,7 @@
 #include <netinet/in.h>
 #include <stdint.h>
 #include <cstddef>
+#include <string>
 #include <utility>
 #include <map>
 #include <list>

- *commit* a97bf3a0a6240406f54e50be9b5b42de0346b0bc - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Thu Dec 22 21:29:39 2016 +0100
Subject: amcl: fix ambiguous use of std::abs with clang/libc++

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

_Diff for modified files_:
diff --git a/src/plugins/amcl/amcl_thread.cpp b/src/plugins/amcl/amcl_thread.cpp
index ebe13f3..f502992 100644
--- a/src/plugins/amcl/amcl_thread.cpp
+++ b/src/plugins/amcl/amcl_thread.cpp
@@ -177,7 +177,7 @@ void AmclThread::init()
     angle_max_idx_ = 359;
   }
   if (angle_max_idx_ > angle_min_idx_) {
-    angle_range_ = (unsigned int)abs(angle_max_idx_ - angle_min_idx_);
+    angle_range_ = (unsigned int)abs((long)angle_max_idx_ - (long)angle_min_idx_);
   } else {
     angle_range_ = (360 - angle_min_idx_) + angle_max_idx_;
   }




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


More information about the fawkes-commits mailing list