summarylogtreecommitdiffstats
path: root/logError_fix.patch
diff options
context:
space:
mode:
authorTim Rakowski2018-01-04 22:10:49 +0100
committerTim Rakowski2018-01-04 22:10:49 +0100
commit4426df05bbf18d4336c5bf6d95b5af1f299ac36d (patch)
tree631b856cd1cc687e4320fafccbb72b71c4c6181f /logError_fix.patch
parent7e583facffc9f246a6b7a8ad7c7bd13e73dd9409 (diff)
downloadaur-4426df05bbf18d4336c5bf6d95b5af1f299ac36d.tar.gz
Backported f7c7b3
- use namespaced macros instead of deprecated macros
Diffstat (limited to 'logError_fix.patch')
-rw-r--r--logError_fix.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/logError_fix.patch b/logError_fix.patch
new file mode 100644
index 000000000000..94e9ca4b21df
--- /dev/null
+++ b/logError_fix.patch
@@ -0,0 +1,25 @@
+Only in patched: build
+diff -ura original/ros_comm-release-release-lunar-rosbag_storage-1.13.5-0/src/bz2_stream.cpp patched/ros_comm-release-release-lunar-rosbag_storage-1.13.5-0/src/bz2_stream.cpp
+--- original/ros_comm-release-release-lunar-rosbag_storage-1.13.5-0/src/bz2_stream.cpp 2017-11-09 21:53:05.000000000 +0100
++++ patched/ros_comm-release-release-lunar-rosbag_storage-1.13.5-0/src/bz2_stream.cpp 2018-01-04 21:16:00.658426238 +0100
+@@ -127,7 +127,7 @@
+ case BZ_OK: return;
+ case BZ_STREAM_END:
+ if (getUnused() || getUnusedLength() > 0)
+- logError("unused data already available");
++ CONSOLE_BRIDGE_logError("unused data already available");
+ else {
+ char* unused;
+ int nUnused;
+diff -ura original/ros_comm-release-release-lunar-rosbag_storage-1.13.5-0/src/lz4_stream.cpp patched/ros_comm-release-release-lunar-rosbag_storage-1.13.5-0/src/lz4_stream.cpp
+--- original/ros_comm-release-release-lunar-rosbag_storage-1.13.5-0/src/lz4_stream.cpp 2017-11-09 21:53:05.000000000 +0100
++++ patched/ros_comm-release-release-lunar-rosbag_storage-1.13.5-0/src/lz4_stream.cpp 2018-01-04 21:16:08.004993287 +0100
+@@ -176,7 +176,7 @@
+ case ROSLZ4_OK: break;
+ case ROSLZ4_STREAM_END:
+ if (getUnused() || getUnusedLength() > 0)
+- logError("unused data already available");
++ CONSOLE_BRIDGE_logError("unused data already available");
+ else {
+ setUnused(lz4s_.input_next);
+ setUnusedLength(lz4s_.input_left);