[ros-roscpp-core] 01/05: New upstream version 0.6.6
Jochen Sprickerhof
jspricke at moszumanska.debian.org
Sat Oct 28 08:17:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
jspricke pushed a commit to annotated tag debian/0.6.6-1
in repository ros-roscpp-core.
commit 22da86e12b12616649673f831dc4235ecd762293
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Sat Oct 28 10:13:21 2017 +0200
New upstream version 0.6.6
---
cpp_common/CHANGELOG.rst | 4 ++++
cpp_common/package.xml | 2 +-
cpp_common/src/header.cpp | 4 ++--
roscpp_core/package.xml | 2 +-
roscpp_serialization/CHANGELOG.rst | 3 +++
roscpp_serialization/package.xml | 2 +-
roscpp_traits/CHANGELOG.rst | 5 +++++
roscpp_traits/include/ros/message_event.h | 2 +-
roscpp_traits/include/ros/message_forward.h | 3 +--
roscpp_traits/package.xml | 2 +-
rostime/CHANGELOG.rst | 5 +++++
rostime/include/ros/time.h | 2 +-
rostime/package.xml | 2 +-
rostime/src/time.cpp | 16 +++++-----------
14 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/cpp_common/CHANGELOG.rst b/cpp_common/CHANGELOG.rst
index 66f73d6..d608c69 100644
--- a/cpp_common/CHANGELOG.rst
+++ b/cpp_common/CHANGELOG.rst
@@ -2,6 +2,10 @@
Changelog for package cpp_common
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.6.6 (2017-10-25)
+------------------
+* replace usage of deprecated logError macros (`#69 <https://github.com/ros/roscpp_core/issues/69>`_)
+
0.6.5 (2017-07-27)
------------------
diff --git a/cpp_common/package.xml b/cpp_common/package.xml
index 15ddf58..e6b0f84 100644
--- a/cpp_common/package.xml
+++ b/cpp_common/package.xml
@@ -1,6 +1,6 @@
<package>
<name>cpp_common</name>
- <version>0.6.5</version>
+ <version>0.6.6</version>
<description>
cpp_common contains C++ code for doing things that are not necessarily ROS
related, but are useful for multiple packages. This includes things like
diff --git a/cpp_common/src/header.cpp b/cpp_common/src/header.cpp
index b001129..4a25b78 100644
--- a/cpp_common/src/header.cpp
+++ b/cpp_common/src/header.cpp
@@ -79,7 +79,7 @@ bool Header::parse(uint8_t* buffer, uint32_t size, std::string& error_msg)
if (len > 1000000)
{
error_msg = "Received an invalid TCPROS header. Each element must be prepended by a 4-byte length.";
- logError("%s", error_msg.c_str());
+ CONSOLE_BRIDGE_logError("%s", error_msg.c_str());
return false;
}
@@ -93,7 +93,7 @@ bool Header::parse(uint8_t* buffer, uint32_t size, std::string& error_msg)
if (eqpos == string::npos)
{
error_msg = "Received an invalid TCPROS header. Each line must have an equals sign.";
- logError("%s", error_msg.c_str());
+ CONSOLE_BRIDGE_logError("%s", error_msg.c_str());
return false;
}
diff --git a/roscpp_core/package.xml b/roscpp_core/package.xml
index ef4979b..9b7db2c 100644
--- a/roscpp_core/package.xml
+++ b/roscpp_core/package.xml
@@ -1,6 +1,6 @@
<package>
<name>roscpp_core</name>
- <version>0.6.5</version>
+ <version>0.6.6</version>
<description>
Underlying data libraries for roscpp messages.
</description>
diff --git a/roscpp_serialization/CHANGELOG.rst b/roscpp_serialization/CHANGELOG.rst
index 50fad12..3c4e498 100644
--- a/roscpp_serialization/CHANGELOG.rst
+++ b/roscpp_serialization/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package roscpp_serialization
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.6.6 (2017-10-25)
+------------------
+
0.6.5 (2017-07-27)
------------------
diff --git a/roscpp_serialization/package.xml b/roscpp_serialization/package.xml
index 9b685b0..a795c81 100644
--- a/roscpp_serialization/package.xml
+++ b/roscpp_serialization/package.xml
@@ -1,6 +1,6 @@
<package>
<name>roscpp_serialization</name>
- <version>0.6.5</version>
+ <version>0.6.6</version>
<description>
roscpp_serialization contains the code for serialization as described in
<a href="http://www.ros.org/wiki/roscpp/Overview/MessagesSerializationAndAdaptingTypes">MessagesSerializationAndAdaptingTypes</a>.
diff --git a/roscpp_traits/CHANGELOG.rst b/roscpp_traits/CHANGELOG.rst
index 223644b..13f879b 100644
--- a/roscpp_traits/CHANGELOG.rst
+++ b/roscpp_traits/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package roscpp_traits
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.6.6 (2017-10-25)
+------------------
+* fix assignment operator of MessageEvent (`#66 <https://github.com/ros/roscpp_core/issues/66>`_)
+* fix docblock of ROS_DECLARE_MESSAGE_WITH_ALLOCATOR (`#67 <https://github.com/ros/roscpp_core/issues/67>`_)
+
0.6.5 (2017-07-27)
------------------
diff --git a/roscpp_traits/include/ros/message_event.h b/roscpp_traits/include/ros/message_event.h
index 9d79526..bbcafbf 100644
--- a/roscpp_traits/include/ros/message_event.h
+++ b/roscpp_traits/include/ros/message_event.h
@@ -200,7 +200,7 @@ public:
bool operator==(const MessageEvent<M>& rhs)
{
- return message_ = rhs.message_ && receipt_time_ == rhs.receipt_time_ && nonconst_need_copy_ == rhs.nonconst_need_copy_;
+ return message_ == rhs.message_ && receipt_time_ == rhs.receipt_time_ && nonconst_need_copy_ == rhs.nonconst_need_copy_;
}
bool operator!=(const MessageEvent<M>& rhs)
diff --git a/roscpp_traits/include/ros/message_forward.h b/roscpp_traits/include/ros/message_forward.h
index a8203a3..e5b46a0 100644
--- a/roscpp_traits/include/ros/message_forward.h
+++ b/roscpp_traits/include/ros/message_forward.h
@@ -51,8 +51,7 @@ template<typename T> class shared_ptr;
/**
* \brief Forward-declare a message, including Ptr and ConstPtr types, with an allocator
*
- * \param ns The namespace the message should be declared inside
- * \param m The "base" message type, i.e. the name of the .msg file
+ * \param msg The "base" message type, i.e., the name of the .msg file
* \param new_name The name you'd like the message to have
* \param alloc The allocator to use, e.g. std::allocator
*/
diff --git a/roscpp_traits/package.xml b/roscpp_traits/package.xml
index e50f4cf..810f36e 100644
--- a/roscpp_traits/package.xml
+++ b/roscpp_traits/package.xml
@@ -1,6 +1,6 @@
<package>
<name>roscpp_traits</name>
- <version>0.6.5</version>
+ <version>0.6.6</version>
<description>
roscpp_traits contains the message traits code as described in
<a href="http://www.ros.org/wiki/roscpp/Overview/MessagesTraits">MessagesTraits</a>.
diff --git a/rostime/CHANGELOG.rst b/rostime/CHANGELOG.rst
index ad6e09d..e668a69 100644
--- a/rostime/CHANGELOG.rst
+++ b/rostime/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package rostime
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.6.6 (2017-10-25)
+------------------
+* only use Apple features on Apple (`#68 <https://github.com/ros/roscpp_core/issues/68>`_)
+* remove exception specification (`#64 <https://github.com/ros/roscpp_core/issues/64>`_)
+
0.6.5 (2017-07-27)
------------------
* add additional checks for valid time values (`#62 <https://github.com/ros/roscpp_core/pull/62>`_)
diff --git a/rostime/include/ros/time.h b/rostime/include/ros/time.h
index d0fba0a..5943876 100644
--- a/rostime/include/ros/time.h
+++ b/rostime/include/ros/time.h
@@ -153,7 +153,7 @@ namespace ros
T& fromSec(double t) {
int64_t sec64 = (int64_t)floor(t);
if (sec64 < 0 || sec64 > UINT_MAX)
- throw std::runtime_error("Duration is out of dual 32-bit range");
+ throw std::runtime_error("Time is out of dual 32-bit range");
sec = (uint32_t)sec64;
nsec = (uint32_t)boost::math::round((t-sec) * 1e9);
// avoid rounding errors
diff --git a/rostime/package.xml b/rostime/package.xml
index a83dc2b..6ce6425 100644
--- a/rostime/package.xml
+++ b/rostime/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rostime</name>
- <version>0.6.5</version>
+ <version>0.6.6</version>
<description>
Time and Duration implementations for C++ libraries, including roscpp.
</description>
diff --git a/rostime/src/time.cpp b/rostime/src/time.cpp
index d08c92c..e461f93 100644
--- a/rostime/src/time.cpp
+++ b/rostime/src/time.cpp
@@ -46,10 +46,10 @@
#include <limits>
// time related includes for macOS
-#if defined(__MACH__)
+#if defined(__APPLE__)
#include <mach/clock.h>
#include <mach/mach.h>
-#endif // defined(__MACH__)
+#endif // defined(__APPLE__)
#include <boost/thread/mutex.hpp>
#include <boost/io/ios_state.hpp>
@@ -100,9 +100,6 @@ namespace ros
* (i.e. not exposed to users of the time classes)
*/
void ros_walltime(uint32_t& sec, uint32_t& nsec)
-#ifndef WIN32
- throw(NoHighPerformanceTimersException)
-#endif
{
#ifndef WIN32
#if HAS_CLOCK_GETTIME
@@ -182,13 +179,10 @@ namespace ros
}
void ros_steadytime(uint32_t& sec, uint32_t& nsec)
-#ifndef WIN32
- throw(NoHighPerformanceTimersException)
-#endif
{
#ifndef WIN32
timespec start;
-#if defined(__MACH__)
+#if defined(__APPLE__)
// On macOS use clock_get_time.
clock_serv_t cclock;
mach_timespec_t mts;
@@ -197,10 +191,10 @@ namespace ros
mach_port_deallocate(mach_task_self(), cclock);
start.tv_sec = mts.tv_sec;
start.tv_nsec = mts.tv_nsec;
-#else // defined(__MACH__)
+#else // defined(__APPLE__)
// Otherwise use clock_gettime.
clock_gettime(CLOCK_MONOTONIC, &start);
-#endif // defined(__MACH__)
+#endif // defined(__APPLE__)
sec = start.tv_sec;
nsec = start.tv_nsec;
#else
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-roscpp-core.git
More information about the debian-science-commits
mailing list