Changes have been pushed for the repository "fawkesrobotics/fawkes".
Clone: https://github.com/fawkesrobotics/fawkes.git Gitweb: https://github.com/fawkesrobotics/fawkes The branch, master has been updated to 4923a6c1fda7799ad32b57f84ec9111bd716fd84 (commit) via deebf037aff6547e878bed91bc89ec985a6dff50 (commit) via 2bea96dc5d425fad42ae5fa172d0136dc3c54234 (commit) via 0229e90ad2929c7218b8b40fdfddd09479246760 (commit) via eb1a0a19bf967d253904f1009deb2631c0886368 (commit) via 27faab199d2451831015557b075fdfeac6f13946 (commit) via 241b0b36ddea893e306c5837dd0c6667bd653664 (commit) via 16807bd94101478b6ef042b503445c68634a7909 (commit) via 7cc59537532ca657bd636e958237d70a52a3facc (commit) via 290003c13bf808a5e1f582ec57bd17722f29ee74 (commit) via 20a644503de378e08dc3234dd62c60e78da91253 (commit) via cf05c9fdc855218df86d368f947387e7c188eb61 (commit) via 5e6cc95d9c1b50b4376f36c3ec725f1d0ada3a8a (commit) via 5324ad4487ed7ad20fbd1d591859d98c097636ca (commit) via 550a8aaf9577d9e12c751c7f8e9a912001b65664 (commit) via 4c8a5f8ffa61472a6f26cfc92dd4df748bfdb3fc (commit) via e4db330ae5ac8c2f3714eb844a95839c23d198ad (commit) via 7209046992085164e799455ef13e5d9cb15e0037 (commit) via 2b45f1f62ce8c005e53de50f248dbd5700406b3a (commit) via 4510f99b4813bfc9f2fdf040d6b1d067d2ada931 (commit) via 4596d845ac11c9c343f76fc29be78b9d07f59623 (commit) via c2c93bfd38777f81fb708b2cb74393ad5a204786 (commit) via 48f47f1c0928209c113adedd3cc08b49ff64ad77 (commit) via 0f21fb7ae17029ee26eab5f3275cd48daa3c7d01 (commit) via 6e2938db2f0333d18dc72a44ab9554b266cc6cd1 (commit) via 3a57cfe6391f0f6666ceb6062f3a5717372343eb (commit) via 28f74cd88217bbccf6cd4acf2c12cc640b2012d2 (commit) via 8b9b6e5251666961eea7e988501453b0f19eac7c (commit) from 375f7d3b0ba34226e4208becebe5fcec79d62959 (commit) https://github.com/fawkesrobotics/fawkes/tree/master 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 8b9b6e5251666961eea7e988501453b0f19eac7c Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 4 13:18:06 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 utils: make sure that strings are always null-terminated When copying a string, copy one byte less than the size of the destination char* to make sure that we always null-terminate the string. https://github.com/fawkesrobotics/fawkes/commit/8b9b6e525 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 28f74cd88217bbccf6cd4acf2c12cc640b2012d2 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 4 13:20:09 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 aspect: add missing include for stdexcept https://github.com/fawkesrobotics/fawkes/commit/28f74cd88 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3a57cfe6391f0f6666ceb6062f3a5717372343eb Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 4 13:27:35 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 buildsys: CGAL is now a header-only library The libraries libCGAL and libCGAL_Core do not exist anymore, as the library is now header-only. Adapt the LDFLAGS accordingly. https://github.com/fawkesrobotics/fawkes/commit/3a57cfe63 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 6e2938db2f0333d18dc72a44ab9554b266cc6cd1 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 4 13:29:11 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 asp: add missing include for std::string https://github.com/fawkesrobotics/fawkes/commit/6e2938db2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 0f21fb7ae17029ee26eab5f3275cd48daa3c7d01 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 4 14:18:38 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 laser-filter: fix type of match length The variable match1_length is used as a size of a char* and should thus be of type size_t, not unsigned int. https://github.com/fawkesrobotics/fawkes/commit/0f21fb7ae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 48f47f1c0928209c113adedd3cc08b49ff64ad77 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 14 14:25:38 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 blackboard: reformat code with clang-format Automatically performed using format target and clang-format on Fedora 32. Automatically committed using: for f in $(git ls-files --modified | awk -F/ '{ print $1 }' | sort -u); do cat <<EOM | git commit -F- $f THIS MESSAGE EOM done https://github.com/fawkesrobotics/fawkes/commit/48f47f1c0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit c2c93bfd38777f81fb708b2cb74393ad5a204786 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 14 14:25:40 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 config: reformat code with clang-format Automatically performed using format target and clang-format on Fedora 32. Automatically committed using: for f in $(git ls-files --modified | awk -F/ '{ print $1 }' | sort -u); do cat <<EOM | git commit -F- $f THIS MESSAGE EOM done https://github.com/fawkesrobotics/fawkes/commit/c2c93bfd3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 4596d845ac11c9c343f76fc29be78b9d07f59623 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 14 14:25:42 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 core: reformat code with clang-format Automatically performed using format target and clang-format on Fedora 32. Automatically committed using: for f in $(git ls-files --modified | awk -F/ '{ print $1 }' | sort -u); do cat <<EOM | git commit -F- $f THIS MESSAGE EOM done https://github.com/fawkesrobotics/fawkes/commit/4596d845a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 4510f99b4813bfc9f2fdf040d6b1d067d2ada931 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 14 14:25:44 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 fvmodels: reformat code with clang-format Automatically performed using format target and clang-format on Fedora 32. Automatically committed using: for f in $(git ls-files --modified | awk -F/ '{ print $1 }' | sort -u); do cat <<EOM | git commit -F- $f THIS MESSAGE EOM done https://github.com/fawkesrobotics/fawkes/commit/4510f99b4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 2b45f1f62ce8c005e53de50f248dbd5700406b3a Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 14 14:25:46 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 interface: reformat code with clang-format Automatically performed using format target and clang-format on Fedora 32. Automatically committed using: for f in $(git ls-files --modified | awk -F/ '{ print $1 }' | sort -u); do cat <<EOM | git commit -F- $f THIS MESSAGE EOM done https://github.com/fawkesrobotics/fawkes/commit/2b45f1f62 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 7209046992085164e799455ef13e5d9cb15e0037 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 14 14:25:48 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 protoboard: reformat code with clang-format Automatically performed using format target and clang-format on Fedora 32. Automatically committed using: for f in $(git ls-files --modified | awk -F/ '{ print $1 }' | sort -u); do cat <<EOM | git commit -F- $f THIS MESSAGE EOM done https://github.com/fawkesrobotics/fawkes/commit/720904699 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit e4db330ae5ac8c2f3714eb844a95839c23d198ad Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 14 14:25:50 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 utils: reformat code with clang-format Automatically performed using format target and clang-format on Fedora 32. Automatically committed using: for f in $(git ls-files --modified | awk -F/ '{ print $1 }' | sort -u); do cat <<EOM | git commit -F- $f THIS MESSAGE EOM done https://github.com/fawkesrobotics/fawkes/commit/e4db330ae - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 4c8a5f8ffa61472a6f26cfc92dd4df748bfdb3fc Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 14 14:26:00 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 openni: reformat code with clang-format Automatically performed using format target and clang-format on Fedora 32. Automatically committed using: for f in $(git ls-files --modified | awk -F/ '{ print $1 }' | sort -u); do cat <<EOM | git commit -F- $f THIS MESSAGE EOM done https://github.com/fawkesrobotics/fawkes/commit/4c8a5f8ff - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 550a8aaf9577d9e12c751c7f8e9a912001b65664 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 14 14:26:02 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 openprs: reformat code with clang-format Automatically performed using format target and clang-format on Fedora 32. Automatically committed using: for f in $(git ls-files --modified | awk -F/ '{ print $1 }' | sort -u); do cat <<EOM | git commit -F- $f THIS MESSAGE EOM done https://github.com/fawkesrobotics/fawkes/commit/550a8aaf9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 5324ad4487ed7ad20fbd1d591859d98c097636ca Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 25 10:47:19 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 buildkite: switch to Fedora 32 https://github.com/fawkesrobotics/fawkes/commit/5324ad448 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 5e6cc95d9c1b50b4376f36c3ec725f1d0ada3a8a Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 25 12:46:42 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 utils: remove erroneous documentation for empty return types https://github.com/fawkesrobotics/fawkes/commit/5e6cc95d9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit cf05c9fdc855218df86d368f947387e7c188eb61 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 25 12:47:59 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 interface: remove erroneous documentation for empty return types https://github.com/fawkesrobotics/fawkes/commit/cf05c9fdc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 20a644503de378e08dc3234dd62c60e78da91253 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 25 12:49:34 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 openrave: remove erroneous documentation for empty return types https://github.com/fawkesrobotics/fawkes/commit/20a644503 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 290003c13bf808a5e1f582ec57bd17722f29ee74 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 25 12:50:31 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 fvcams: remove erroneous documentation for empty return types https://github.com/fawkesrobotics/fawkes/commit/290003c13 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 7cc59537532ca657bd636e958237d70a52a3facc Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Mon May 25 12:52:23 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 protoboard: remove erroneous documentation for empty return types https://github.com/fawkesrobotics/fawkes/commit/7cc595375 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 16807bd94101478b6ef042b503445c68634a7909 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Jun 24 10:03:00 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 10:59:50 2020 +0200 pcl_utils: add missing doxygen documentation Only the base class StorageAdapter was documented. Also provide documentation for its sub-class PointCloudStorageAdapter. https://github.com/fawkesrobotics/fawkes/commit/16807bd94 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 241b0b36ddea893e306c5837dd0c6667bd653664 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Jun 24 10:25:35 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 12:18:19 2020 +0200 protobuf_comm: enable template instantiation via type template parameter Do not use the return type to enable/disable the function overload, as this confuses doxygen. Instead, directly use the type template parameter to enable the function overload if the base class is correct. https://github.com/fawkesrobotics/fawkes/commit/241b0b36d - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 27faab199d2451831015557b075fdfeac6f13946 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Jun 24 10:33:08 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 12:18:19 2020 +0200 buildsys: do not use opencv4 We do not support opencv4 yet. If we found opencv4, disable opencv support. https://github.com/fawkesrobotics/fawkes/commit/27faab199 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit eb1a0a19bf967d253904f1009deb2631c0886368 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Jun 24 10:47:19 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 12:18:19 2020 +0200 gazebo: disable TBB compiler warnings Gazebo uses deprecated messages from TBB. We can't do anything about it, so disable the warning for now. https://github.com/fawkesrobotics/fawkes/commit/eb1a0a19b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 0229e90ad2929c7218b8b40fdfddd09479246760 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Jun 24 10:52:51 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 12:18:19 2020 +0200 gazebo: re-enable warnings for deprecated declarations with gazebo >= 10 The issue with older gazebo versions was fixed in gazebo 10, thus we only need to disable the warning with older gazebo versions. https://github.com/fawkesrobotics/fawkes/commit/0229e90ad - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 2bea96dc5d425fad42ae5fa172d0136dc3c54234 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Jun 24 11:26:07 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 12:18:19 2020 +0200 buildsys: conditionalize CGAL build flags on CGAL version CGAL version >=5 is a header-only library, but older versions need additional flags. Thus, check for the CGAL version by parsing the CGAL version header and conditionally add build flags. https://github.com/fawkesrobotics/fawkes/commit/2bea96dc5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit deebf037aff6547e878bed91bc89ec985a6dff50 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Jun 24 12:00:33 2020 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Jun 24 12:18:19 2020 +0200 buildsys: use sed instead of GNU grep to detect CGAL version FreeBSD does not have GNU grep and `-P` is a GNU extension that is not available on FreeBSD. Use sed instead. https://github.com/fawkesrobotics/fawkes/commit/deebf037a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 4923a6c1fda7799ad32b57f84ec9111bd716fd84 Merge: 375f7d3b0 deebf037a Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 16 18:37:19 2020 +0200 Commit: GitHub <nore...@github.com> CommitDate: Wed Sep 16 18:37:19 2020 +0200 Merge pull request #232 from fawkesrobotics/thofmann/fedora32 Switch to Fedora 32 https://github.com/fawkesrobotics/fawkes/commit/4923a6c1f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- .buildkite/pipeline.yml | 2 +- etc/buildsys/cgal.mk | 16 +++- etc/buildsys/fvconf.mk | 4 + src/libs/aspect/blocked_timing.cpp | 2 + src/libs/blackboard/blackboard.h | 4 +- src/libs/blackboard/internal/memory_manager.cpp | 3 +- src/libs/config/yaml_node.h | 3 +- src/libs/core/exception.cpp | 3 +- src/libs/core/macros.h | 110 ++++++++++++------------ src/libs/core/utils/circular_buffer.h | 3 +- src/libs/core/utils/lock_hashmap.h | 4 +- src/libs/core/utils/lock_hashset.h | 4 +- src/libs/core/utils/lock_multimap.h | 4 +- src/libs/core/utils/lockptr.h | 6 +- src/libs/core/utils/refptr.h | 6 +- src/libs/fvcams/control/sony_evid100p.cpp | 1 - src/libs/fvmodels/scanlines/beams.cpp | 6 +- src/libs/fvmodels/scanlines/cornerhorizon.cpp | 6 +- src/libs/fvmodels/scanlines/grid.cpp | 6 +- src/libs/fvmodels/scanlines/line_grid.cpp | 6 +- src/libs/fvmodels/scanlines/radial.cpp | 6 +- src/libs/fvmodels/scanlines/star.cpp | 6 +- src/libs/interface/field_iterator.cpp | 3 +- src/libs/interface/message_queue.cpp | 7 +- src/libs/pcl_utils/storage_adapter.h | 44 ++++++++++ src/libs/protoboard/blackboard_manager.h | 14 +-- src/libs/protobuf_comm/message_register.h | 13 ++- src/libs/utils/ipc/shm.cpp | 13 +-- src/libs/utils/misc/autofree.cpp | 3 +- src/libs/utils/system/argparser.cpp | 2 - src/libs/utils/system/dynamic_module/module.cpp | 1 - src/libs/utils/time/time.cpp | 4 +- src/plugins/asp/aspect/clingo_control_manager.h | 1 + src/plugins/gazebo/gazebo.mk | 11 ++- src/plugins/laser-filter/filters/deadspots.cpp | 2 +- src/plugins/openni/handtracker_thread.cpp | 42 ++++----- src/plugins/openni/usertracker_thread.cpp | 32 +++---- src/plugins/openprs/mod_utils.h | 8 +- src/plugins/openrave/environment.cpp | 3 - 39 files changed, 252 insertions(+), 162 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 8b9b6e5251666961eea7e988501453b0f19eac7c - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 4 13:18:06 2020 +0200 Subject: utils: make sure that strings are always null-terminated src/libs/utils/ipc/shm.cpp | 13 +++++++------ src/libs/utils/time/time.cpp | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) _Diff for modified files_: diff --git a/src/libs/utils/ipc/shm.cpp b/src/libs/utils/ipc/shm.cpp index e0142e8e3..10e4d1d88 100644 --- a/src/libs/utils/ipc/shm.cpp +++ b/src/libs/utils/ipc/shm.cpp @@ -244,7 +244,7 @@ SharedMemory::SharedMemory(const char *magic_token, { _magic_token = new char[MagicTokenSize]; memset(_magic_token, 0, MagicTokenSize); - strncpy(_magic_token, magic_token, MagicTokenSize); + strncpy(_magic_token, magic_token, MagicTokenSize - 1); _is_read_only = is_read_only; _destroy_on_delete = destroy_on_delete; @@ -280,7 +280,7 @@ SharedMemory::SharedMemory(const SharedMemory &s) { _magic_token = new char[MagicTokenSize]; memset(_magic_token, 0, MagicTokenSize); - strncpy(_magic_token, s._magic_token, MagicTokenSize); + strncpy(_magic_token, s._magic_token, MagicTokenSize - 1); _is_read_only = s._is_read_only; _destroy_on_delete = s._destroy_on_delete; @@ -354,7 +354,7 @@ SharedMemory::SharedMemory(const char * magic_token, { _magic_token = new char[MagicTokenSize]; memset(_magic_token, 0, MagicTokenSize); - strncpy(_magic_token, magic_token, MagicTokenSize); + strncpy(_magic_token, magic_token, MagicTokenSize - 1); _header = header; _is_read_only = is_read_only; @@ -437,7 +437,7 @@ SharedMemory::operator=(const SharedMemory &s) _magic_token = new char[MagicTokenSize]; memset(_magic_token, 0, MagicTokenSize); - strncpy(_magic_token, s._magic_token, MagicTokenSize); + strncpy(_magic_token, s._magic_token, MagicTokenSize - 1); _is_read_only = s._is_read_only; _destroy_on_delete = s._destroy_on_delete; @@ -596,7 +596,7 @@ SharedMemory::attach() _shm_offset = 0; shared_mem_upper_bound_ = _shm_upper_bound; - strncpy(_shm_magic_token, _magic_token, MagicTokenSize); + strncpy(_shm_magic_token, _magic_token, MagicTokenSize - 1); _header->initialize((char *)shared_mem_ + MagicTokenSize + sizeof(SharedMemory_header_t)); } else { @@ -1532,7 +1532,8 @@ SharedMemory::SharedMemoryIterator::operator!=(const SharedMemoryIterator &s) co /** Get SharedMemoryHeader. * @return shared memory header */ -const SharedMemoryHeader *SharedMemory::SharedMemoryIterator::operator*() const +const SharedMemoryHeader * +SharedMemory::SharedMemoryIterator::operator*() const { return header_; } diff --git a/src/libs/utils/time/time.cpp b/src/libs/utils/time/time.cpp index 35cc03e10..0f8b4b17e 100644 --- a/src/libs/utils/time/time.cpp +++ b/src/libs/utils/time/time.cpp @@ -180,7 +180,7 @@ Time::Time(const Time &t) clock_ = t.clock_; if (t.timestr_) { timestr_ = (char *)malloc(TIMESTR_SIZE); - strncpy(timestr_, t.timestr_, TIMESTR_SIZE); + strncpy(timestr_, t.timestr_, TIMESTR_SIZE - 1); } else { timestr_ = NULL; } @@ -196,7 +196,7 @@ Time::Time(const Time *t) clock_ = t->clock_; if (t->timestr_) { timestr_ = (char *)malloc(TIMESTR_SIZE); - strncpy(timestr_, t->timestr_, TIMESTR_SIZE); + strncpy(timestr_, t->timestr_, TIMESTR_SIZE - 1); } else { timestr_ = NULL; } - *commit* 28f74cd88217bbccf6cd4acf2c12cc640b2012d2 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 4 13:20:09 2020 +0200 Subject: aspect: add missing include for stdexcept src/libs/aspect/blocked_timing.cpp | 2 ++ 1 file changed, 2 insertions(+) _Diff for modified files_: diff --git a/src/libs/aspect/blocked_timing.cpp b/src/libs/aspect/blocked_timing.cpp index 574a63ad9..133100c53 100644 --- a/src/libs/aspect/blocked_timing.cpp +++ b/src/libs/aspect/blocked_timing.cpp @@ -25,6 +25,8 @@ #include <core/exception.h> #include <core/threading/thread.h> +#include <stdexcept> + namespace fawkes { /** @class BlockedTimingAspect <aspect/blocked_timing.h> - *commit* 3a57cfe6391f0f6666ceb6062f3a5717372343eb - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 4 13:27:35 2020 +0200 Subject: buildsys: CGAL is now a header-only library etc/buildsys/cgal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _Diff for modified files_: diff --git a/etc/buildsys/cgal.mk b/etc/buildsys/cgal.mk index 2b6211868..1cbc63f09 100644 --- a/etc/buildsys/cgal.mk +++ b/etc/buildsys/cgal.mk @@ -38,7 +38,7 @@ ifeq ($(CGAL_HAVE_BOOST_LIBS),1) # Disable this runtime check since it fails when using valgrind CFLAGS_CGAL += -DCGAL_DISABLE_ROUNDING_MATH_CHECK - LDFLAGS_CGAL:=-lCGAL -lCGAL_Core -lgmp -lmpfr -lm \ + LDFLAGS_CGAL:=-lgmp -lmpfr -lm \ $(call boost-libs-ldflags,$(REQ_BOOST_LIBS)) ifeq ($(CC),clang) - *commit* 6e2938db2f0333d18dc72a44ab9554b266cc6cd1 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 4 13:29:11 2020 +0200 Subject: asp: add missing include for std::string src/plugins/asp/aspect/clingo_control_manager.h | 1 + 1 file changed, 1 insertion(+) _Diff for modified files_: diff --git a/src/plugins/asp/aspect/clingo_control_manager.h b/src/plugins/asp/aspect/clingo_control_manager.h index 2c9661b7d..a57e91b00 100644 --- a/src/plugins/asp/aspect/clingo_control_manager.h +++ b/src/plugins/asp/aspect/clingo_control_manager.h @@ -25,6 +25,7 @@ #include <core/utils/lockptr.h> +#include <string> #include <unordered_map> namespace fawkes { - *commit* 0f21fb7ae17029ee26eab5f3275cd48daa3c7d01 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 4 14:18:38 2020 +0200 Subject: laser-filter: fix type of match length src/plugins/laser-filter/filters/deadspots.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _Diff for modified files_: diff --git a/src/plugins/laser-filter/filters/deadspots.cpp b/src/plugins/laser-filter/filters/deadspots.cpp index 2c193d5f3..b508e6a77 100644 --- a/src/plugins/laser-filter/filters/deadspots.cpp +++ b/src/plugins/laser-filter/filters/deadspots.cpp @@ -81,7 +81,7 @@ LaserDeadSpotsDataFilter::LaserDeadSpotsDataFilter(const std::string & filter while (vit->next()) { const char *path = vit->path(); if (regexec(&pathre, path, 2, matches, 0) == 0) { - unsigned int match1_length = matches[1].rm_eo - matches[1].rm_so; + size_t match1_length = matches[1].rm_eo - matches[1].rm_so; char entry[match1_length + 1]; entry[match1_length] = 0; - *commit* 48f47f1c0928209c113adedd3cc08b49ff64ad77 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 14 14:25:38 2020 +0200 Subject: blackboard: reformat code with clang-format src/libs/blackboard/blackboard.h | 4 ++-- src/libs/blackboard/internal/memory_manager.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/libs/blackboard/blackboard.h b/src/libs/blackboard/blackboard.h index 0007be961..59d8b0973 100644 --- a/src/libs/blackboard/blackboard.h +++ b/src/libs/blackboard/blackboard.h @@ -258,8 +258,8 @@ operator|(const BlackBoard::ListenerRegisterFlag &a, const BlackBoard::ListenerR * @param b flags to test for * @return resulting flags */ -inline BlackBoard::ListenerRegisterFlag operator&(const BlackBoard::ListenerRegisterFlag &a, - const BlackBoard::ListenerRegisterFlag &b) +inline BlackBoard::ListenerRegisterFlag +operator&(const BlackBoard::ListenerRegisterFlag &a, const BlackBoard::ListenerRegisterFlag &b) { return (BlackBoard::ListenerRegisterFlag)((int)a & (int)b); } diff --git a/src/libs/blackboard/internal/memory_manager.cpp b/src/libs/blackboard/internal/memory_manager.cpp index 02b68253b..58d0a472f 100644 --- a/src/libs/blackboard/internal/memory_manager.cpp +++ b/src/libs/blackboard/internal/memory_manager.cpp @@ -1015,7 +1015,8 @@ BlackBoardMemoryManager::ChunkIterator::operator!=(const ChunkIterator &c) const * points to. * @return pointer to memory */ -void *BlackBoardMemoryManager::ChunkIterator::operator*() const +void * +BlackBoardMemoryManager::ChunkIterator::operator*() const { if (cur_ == NULL) return NULL; - *commit* c2c93bfd38777f81fb708b2cb74393ad5a204786 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 14 14:25:40 2020 +0200 Subject: config: reformat code with clang-format src/libs/config/yaml_node.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) _Diff for modified files_: diff --git a/src/libs/config/yaml_node.h b/src/libs/config/yaml_node.h index 5e5d6f8be..3d5ef0657 100644 --- a/src/libs/config/yaml_node.h +++ b/src/libs/config/yaml_node.h @@ -424,7 +424,8 @@ public: return this->name_ < n.name_; } - std::shared_ptr<YamlConfigurationNode> operator[](const std::string &p) + std::shared_ptr<YamlConfigurationNode> + operator[](const std::string &p) { std::map<std::string, std::shared_ptr<YamlConfigurationNode>>::iterator i; if ((i = children_.find(p)) != children_.end()) { - *commit* 4596d845ac11c9c343f76fc29be78b9d07f59623 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 14 14:25:42 2020 +0200 Subject: core: reformat code with clang-format src/libs/core/exception.cpp | 3 +- src/libs/core/macros.h | 110 +++++++++++++++++----------------- src/libs/core/utils/circular_buffer.h | 3 +- src/libs/core/utils/lock_hashmap.h | 4 +- src/libs/core/utils/lock_hashset.h | 4 +- src/libs/core/utils/lock_multimap.h | 4 +- src/libs/core/utils/lockptr.h | 6 +- src/libs/core/utils/refptr.h | 6 +- 8 files changed, 73 insertions(+), 67 deletions(-) _Diff for modified files_: diff --git a/src/libs/core/exception.cpp b/src/libs/core/exception.cpp index 4d548f706..66a222c19 100644 --- a/src/libs/core/exception.cpp +++ b/src/libs/core/exception.cpp @@ -770,7 +770,8 @@ Exception::iterator::operator!=(const iterator &i) const * Get message at current position. Returns NULL for the invalid ieterator. * @return message or NULL if iterator is invalid */ -const char *Exception::iterator::operator*() const +const char * +Exception::iterator::operator*() const { if (mlist != NULL) { return mlist->msg; diff --git a/src/libs/core/macros.h b/src/libs/core/macros.h index ad6175e92..f7e762c0a 100644 --- a/src/libs/core/macros.h +++ b/src/libs/core/macros.h @@ -22,64 +22,64 @@ */ #ifndef _CORE_MACROS_H_ -# define _CORE_MACROS_H_ +#define _CORE_MACROS_H_ // from http://blog.rlove.org/2005_10_01_archive.html // Note that __GNUC__ is also set appropriately by the Intel compiler -# if __GNUC__ >= 3 -# ifndef __inline -# define __inline inline __attribute__((__always_inline__)) -# endif -# ifndef __pure -# define __pure __attribute__((__pure__)) -# endif -# define __const_ __attribute__((__const__)) -# define __noreturn __attribute__((__noreturn__)) -# define __malloc __attribute__((__malloc__)) -# define __must_check __attribute__((__warn_unused_result__)) -# ifndef __deprecated -# define __deprecated __attribute__((__deprecated__)) -# endif -# ifndef __used -# define __used __attribute__((__used__)) -# endif -# ifndef __unused -# define __unused __attribute__((__unused__)) -# endif -# ifndef __packed -# define __packed __attribute__((__packed__)) -# endif -# ifndef __aligned -# define __aligned(x) __attribute__((__aligned__(x))) -# endif -# define likely(x) __builtin_expect(!!(x), 1) -# define unlikely(x) __builtin_expect(!!(x), 0) -# else -# ifndef __inline -# define __inline /* no inline */ -# endif -# ifndef __pure -# define __pure /* no pure */ -# endif -# define __const_ /* no const */ -# define __noreturn /* no noreturn */ -# define __malloc /* no malloc */ -# define __must_check /* no warn_unused_result */ -# define __deprecated /* no deprecated */ -# ifndef __used -# define __used /* no used */ -# endif -# ifndef __unused -# define __unused /* no unused */ -# endif -# ifndef __packed -# define __packed /* no packed */ -# endif -# ifndef __aligned -# define __aligned(x) /* no align */ -# endif -# define likely(x) (x) -# define unlikely(x) (x) +#if __GNUC__ >= 3 +# ifndef __inline +# define __inline inline __attribute__((__always_inline__)) # endif +# ifndef __pure +# define __pure __attribute__((__pure__)) +# endif +# define __const_ __attribute__((__const__)) +# define __noreturn __attribute__((__noreturn__)) +# define __malloc __attribute__((__malloc__)) +# define __must_check __attribute__((__warn_unused_result__)) +# ifndef __deprecated +# define __deprecated __attribute__((__deprecated__)) +# endif +# ifndef __used +# define __used __attribute__((__used__)) +# endif +# ifndef __unused +# define __unused __attribute__((__unused__)) +# endif +# ifndef __packed +# define __packed __attribute__((__packed__)) +# endif +# ifndef __aligned +# define __aligned(x) __attribute__((__aligned__(x))) +# endif +# define likely(x) __builtin_expect(!!(x), 1) +# define unlikely(x) __builtin_expect(!!(x), 0) +#else +# ifndef __inline +# define __inline /* no inline */ +# endif +# ifndef __pure +# define __pure /* no pure */ +# endif +# define __const_ /* no const */ +# define __noreturn /* no noreturn */ +# define __malloc /* no malloc */ +# define __must_check /* no warn_unused_result */ +# define __deprecated /* no deprecated */ +# ifndef __used +# define __used /* no used */ +# endif +# ifndef __unused +# define __unused /* no unused */ +# endif +# ifndef __packed +# define __packed /* no packed */ +# endif +# ifndef __aligned +# define __aligned(x) /* no align */ +# endif +# define likely(x) (x) +# define unlikely(x) (x) +#endif #endif diff --git a/src/libs/core/utils/circular_buffer.h b/src/libs/core/utils/circular_buffer.h index f42bde1c7..2b089cadb 100644 --- a/src/libs/core/utils/circular_buffer.h +++ b/src/libs/core/utils/circular_buffer.h @@ -124,7 +124,8 @@ public: * @param n position of the element * @return reference to the n-th element */ - const Type &operator[](size_type n) const + const Type & + operator[](size_type n) const { return deque_[n]; } diff --git a/src/libs/core/utils/lock_hashmap.h b/src/libs/core/utils/lock_hashmap.h index 77eb9cb92..3a382f624 100644 --- a/src/libs/core/utils/lock_hashmap.h +++ b/src/libs/core/utils/lock_hashmap.h @@ -157,8 +157,8 @@ LockHashMap<KeyType, ValueType, HashFunction, EqualKey>::mutex() const */ template <typename KeyType, typename ValueType, class HashFunction, typename EqualKey> LockHashMap<KeyType, ValueType, HashFunction, EqualKey> & -LockHashMap<KeyType, ValueType, HashFunction, EqualKey>:: -operator=(const LockHashMap<KeyType, ValueType, HashFunction, EqualKey> &ll) +LockHashMap<KeyType, ValueType, HashFunction, EqualKey>::operator=( + const LockHashMap<KeyType, ValueType, HashFunction, EqualKey> &ll) { mutex_->lock(); ll.lock(); diff --git a/src/libs/core/utils/lock_hashset.h b/src/libs/core/utils/lock_hashset.h index 89f08fd68..a1b89f23d 100644 --- a/src/libs/core/utils/lock_hashset.h +++ b/src/libs/core/utils/lock_hashset.h @@ -169,8 +169,8 @@ LockHashSet<KeyType, HashFunction, EqualKey>::mutex() const */ template <typename KeyType, class HashFunction, class EqualKey> LockHashSet<KeyType, HashFunction, EqualKey> & -LockHashSet<KeyType, HashFunction, EqualKey>:: -operator=(const LockHashSet<KeyType, HashFunction, EqualKey> &ll) +LockHashSet<KeyType, HashFunction, EqualKey>::operator=( + const LockHashSet<KeyType, HashFunction, EqualKey> &ll) { mutex_->lock(); ll.lock(); diff --git a/src/libs/core/utils/lock_multimap.h b/src/libs/core/utils/lock_multimap.h index fee574d12..ec2b17126 100644 --- a/src/libs/core/utils/lock_multimap.h +++ b/src/libs/core/utils/lock_multimap.h @@ -146,8 +146,8 @@ LockMultiMap<KeyType, ValueType, LessKey>::mutex() const */ template <typename KeyType, typename ValueType, typename LessKey> LockMultiMap<KeyType, ValueType, LessKey> & -LockMultiMap<KeyType, ValueType, LessKey>:: -operator=(const LockMultiMap<KeyType, ValueType, LessKey> &ll) +LockMultiMap<KeyType, ValueType, LessKey>::operator=( + const LockMultiMap<KeyType, ValueType, LessKey> &ll) { mutex_->lock(); ll.lock(); diff --git a/src/libs/core/utils/lockptr.h b/src/libs/core/utils/lockptr.h index 55c603852..5ec926ad4 100644 --- a/src/libs/core/utils/lockptr.h +++ b/src/libs/core/utils/lockptr.h @@ -297,13 +297,15 @@ private: // If it would come after them it wouldn't be inlined. template <class T_CppObject> -inline T_CppObject *LockPtr<T_CppObject>::operator->() const +inline T_CppObject * +LockPtr<T_CppObject>::operator->() const { return cpp_object_; } template <class T_CppObject> -inline T_CppObject *LockPtr<T_CppObject>::operator*() const +inline T_CppObject * +LockPtr<T_CppObject>::operator*() const { return cpp_object_; } diff --git a/src/libs/core/utils/refptr.h b/src/libs/core/utils/refptr.h index e97a9f815..b8b7c18a9 100644 --- a/src/libs/core/utils/refptr.h +++ b/src/libs/core/utils/refptr.h @@ -257,13 +257,15 @@ private: // If it would come after them it wouldn't be inlined. template <class T_CppObject> -inline T_CppObject *RefPtr<T_CppObject>::operator->() const +inline T_CppObject * +RefPtr<T_CppObject>::operator->() const { return cpp_object_; } template <class T_CppObject> -inline T_CppObject *RefPtr<T_CppObject>::operator*() const +inline T_CppObject * +RefPtr<T_CppObject>::operator*() const { return cpp_object_; } - *commit* 4510f99b4813bfc9f2fdf040d6b1d067d2ada931 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 14 14:25:44 2020 +0200 Subject: fvmodels: reformat code with clang-format src/libs/fvmodels/scanlines/beams.cpp | 6 ++++-- src/libs/fvmodels/scanlines/cornerhorizon.cpp | 6 ++++-- src/libs/fvmodels/scanlines/grid.cpp | 6 ++++-- src/libs/fvmodels/scanlines/line_grid.cpp | 6 ++++-- src/libs/fvmodels/scanlines/radial.cpp | 6 ++++-- src/libs/fvmodels/scanlines/star.cpp | 6 ++++-- 6 files changed, 24 insertions(+), 12 deletions(-) _Diff for modified files_: diff --git a/src/libs/fvmodels/scanlines/beams.cpp b/src/libs/fvmodels/scanlines/beams.cpp index b95931b39..de6492048 100644 --- a/src/libs/fvmodels/scanlines/beams.cpp +++ b/src/libs/fvmodels/scanlines/beams.cpp @@ -92,12 +92,14 @@ ScanlineBeams::ScanlineBeams(unsigned int image_width, reset(); } -upoint_t ScanlineBeams::operator*() +upoint_t +ScanlineBeams::operator*() { return coord; } -upoint_t *ScanlineBeams::operator->() +upoint_t * +ScanlineBeams::operator->() { return &coord; } diff --git a/src/libs/fvmodels/scanlines/cornerhorizon.cpp b/src/libs/fvmodels/scanlines/cornerhorizon.cpp index 19528ec26..16b20e7e3 100644 --- a/src/libs/fvmodels/scanlines/cornerhorizon.cpp +++ b/src/libs/fvmodels/scanlines/cornerhorizon.cpp @@ -105,12 +105,14 @@ CornerHorizon::~CornerHorizon() delete model; } -upoint_t CornerHorizon::operator*() +upoint_t +CornerHorizon::operator*() { return coord; } -upoint_t *CornerHorizon::operator->() +upoint_t * +CornerHorizon::operator->() { return &coord; } diff --git a/src/libs/fvmodels/scanlines/grid.cpp b/src/libs/fvmodels/scanlines/grid.cpp index b5b7ecac6..6f8580c8c 100644 --- a/src/libs/fvmodels/scanlines/grid.cpp +++ b/src/libs/fvmodels/scanlines/grid.cpp @@ -64,12 +64,14 @@ ScanlineGrid::~ScanlineGrid() delete this->roi; } -upoint_t ScanlineGrid::operator*() +upoint_t +ScanlineGrid::operator*() { return coord; } -upoint_t *ScanlineGrid::operator->() +upoint_t * +ScanlineGrid::operator->() { return &coord; } diff --git a/src/libs/fvmodels/scanlines/line_grid.cpp b/src/libs/fvmodels/scanlines/line_grid.cpp index b809f3e8b..594c5bd92 100644 --- a/src/libs/fvmodels/scanlines/line_grid.cpp +++ b/src/libs/fvmodels/scanlines/line_grid.cpp @@ -73,12 +73,14 @@ ScanlineLineGrid::~ScanlineLineGrid() delete roi_; } -upoint_t ScanlineLineGrid::operator*() +upoint_t +ScanlineLineGrid::operator*() { return *cur_; } -upoint_t *ScanlineLineGrid::operator->() +upoint_t * +ScanlineLineGrid::operator->() { return &*cur_; } diff --git a/src/libs/fvmodels/scanlines/radial.cpp b/src/libs/fvmodels/scanlines/radial.cpp index 769b832af..ac84303f1 100644 --- a/src/libs/fvmodels/scanlines/radial.cpp +++ b/src/libs/fvmodels/scanlines/radial.cpp @@ -74,12 +74,14 @@ ScanlineRadial::ScanlineRadial(unsigned int width, reset(); } -upoint_t ScanlineRadial::operator*() +upoint_t +ScanlineRadial::operator*() { return coord; } -upoint_t *ScanlineRadial::operator->() +upoint_t * +ScanlineRadial::operator->() { return &coord; } diff --git a/src/libs/fvmodels/scanlines/star.cpp b/src/libs/fvmodels/scanlines/star.cpp index dc1fa9be2..1657c424c 100644 --- a/src/libs/fvmodels/scanlines/star.cpp +++ b/src/libs/fvmodels/scanlines/star.cpp @@ -101,12 +101,14 @@ ScanlineStar::~ScanlineStar() } } -upoint_t ScanlineStar::operator*() +upoint_t +ScanlineStar::operator*() { return m_current_point; } -upoint_t *ScanlineStar::operator->() +upoint_t * +ScanlineStar::operator->() { return &m_current_point; } - *commit* 2b45f1f62ce8c005e53de50f248dbd5700406b3a - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 14 14:25:46 2020 +0200 Subject: interface: reformat code with clang-format src/libs/interface/field_iterator.cpp | 3 ++- src/libs/interface/message_queue.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/libs/interface/field_iterator.cpp b/src/libs/interface/field_iterator.cpp index 879bae87a..fb29b8896 100644 --- a/src/libs/interface/field_iterator.cpp +++ b/src/libs/interface/field_iterator.cpp @@ -162,7 +162,8 @@ InterfaceFieldIterator::operator!=(const InterfaceFieldIterator &fi) const /** Get FieldHeader. * @return shared memory header */ -const void *InterfaceFieldIterator::operator*() const +const void * +InterfaceFieldIterator::operator*() const { if (infol_ == NULL) { throw NullPointerException("Cannot get value of end element"); diff --git a/src/libs/interface/message_queue.cpp b/src/libs/interface/message_queue.cpp index 4274cad6d..bb84a6cf3 100644 --- a/src/libs/interface/message_queue.cpp +++ b/src/libs/interface/message_queue.cpp @@ -462,7 +462,8 @@ MessageQueue::MessageIterator::operator!=(const MessageIterator &c) const * points to. * @return pointer to memory */ -Message *MessageQueue::MessageIterator::operator*() const +Message * +MessageQueue::MessageIterator::operator*() const { return (cur != NULL) ? cur->msg : NULL; } @@ -471,7 +472,8 @@ Message *MessageQueue::MessageIterator::operator*() const * Node that you have to make sure that this is not called on the end node! * @return current message */ -Message *MessageQueue::MessageIterator::operator->() const +Message * +MessageQueue::MessageIterator::operator->() const { return cur->msg; } - *commit* 7209046992085164e799455ef13e5d9cb15e0037 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 14 14:25:48 2020 +0200 Subject: protoboard: reformat code with clang-format src/libs/protoboard/blackboard_manager.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/libs/protoboard/blackboard_manager.h b/src/libs/protoboard/blackboard_manager.h index 36483bdb7..90ac38f0a 100644 --- a/src/libs/protoboard/blackboard_manager.h +++ b/src/libs/protoboard/blackboard_manager.h @@ -293,16 +293,16 @@ ProtobufSender<IfaceManagerTs...>::finalize() template <class IfaceT, class MessageT> void -AbstractProtobufSender::handle_messages:: -operator()(const bb_iface_manager<IfaceT, type_list<MessageT>> &pair) const +AbstractProtobufSender::handle_messages::operator()( + const bb_iface_manager<IfaceT, type_list<MessageT>> &pair) const { manager->handle_message_type<MessageT>(pair.interface()); } template <class IfaceT, class MessageT1, class... MessageTs> void -AbstractProtobufSender::handle_messages:: -operator()(const bb_iface_manager<IfaceT, type_list<MessageT1, MessageTs...>> &iface_mgr) const +AbstractProtobufSender::handle_messages::operator()( + const bb_iface_manager<IfaceT, type_list<MessageT1, MessageTs...>> &iface_mgr) const { BlackboardManager::on_interface<IfaceT>{iface_mgr.interface(), manager} .template handle_msg_types<MessageTs...>(); - *commit* e4db330ae5ac8c2f3714eb844a95839c23d198ad - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 14 14:25:50 2020 +0200 Subject: utils: reformat code with clang-format src/libs/utils/misc/autofree.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) _Diff for modified files_: diff --git a/src/libs/utils/misc/autofree.cpp b/src/libs/utils/misc/autofree.cpp index 27ec72c04..c119e7df4 100644 --- a/src/libs/utils/misc/autofree.cpp +++ b/src/libs/utils/misc/autofree.cpp @@ -83,7 +83,8 @@ MemAutoFree::reset(void *new_ptr) /** Access memory pointer. * @return pointer to memory, maybe NULL */ -void *MemAutoFree::operator*() const +void * +MemAutoFree::operator*() const { return ptr_; } - *commit* 4c8a5f8ffa61472a6f26cfc92dd4df748bfdb3fc - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 14 14:26:00 2020 +0200 Subject: openni: reformat code with clang-format src/plugins/openni/handtracker_thread.cpp | 42 +++++++++++++++---------------- src/plugins/openni/usertracker_thread.cpp | 32 +++++++++++------------ 2 files changed, 37 insertions(+), 37 deletions(-) _Diff for modified files_: diff --git a/src/plugins/openni/handtracker_thread.cpp b/src/plugins/openni/handtracker_thread.cpp index 20d8fc68a..5965b4fb0 100644 --- a/src/plugins/openni/handtracker_thread.cpp +++ b/src/plugins/openni/handtracker_thread.cpp @@ -53,51 +53,51 @@ OpenNiHandTrackerThread::~OpenNiHandTrackerThread() } static void XN_CALLBACK_TYPE - cb_hand_create(xn::HandsGenerator &generator, - XnUserID user, - const XnPoint3D * position, - XnFloat time, - void * cookie) +cb_hand_create(xn::HandsGenerator &generator, + XnUserID user, + const XnPoint3D * position, + XnFloat time, + void * cookie) { OpenNiHandTrackerThread *t = static_cast<OpenNiHandTrackerThread *>(cookie); t->hand_create(user, position, time); } static void XN_CALLBACK_TYPE - cb_hand_destroy(xn::HandsGenerator &generator, XnUserID user, XnFloat time, void *cookie) +cb_hand_destroy(xn::HandsGenerator &generator, XnUserID user, XnFloat time, void *cookie) { OpenNiHandTrackerThread *t = static_cast<OpenNiHandTrackerThread *>(cookie); t->hand_destroy(user, time); } static void XN_CALLBACK_TYPE - cb_hand_update(xn::HandsGenerator &generator, - XnUserID user, - const XnPoint3D * position, - XnFloat time, - void * cookie) +cb_hand_update(xn::HandsGenerator &generator, + XnUserID user, + const XnPoint3D * position, + XnFloat time, + void * cookie) { OpenNiHandTrackerThread *t = static_cast<OpenNiHandTrackerThread *>(cookie); t->hand_update(user, position, time); } static void XN_CALLBACK_TYPE - cb_gesture_recognized(xn::GestureGenerator &generator, - const XnChar * gesture_name, - const XnPoint3D * position, - const XnPoint3D * end_position, - void * cookie) +cb_gesture_recognized(xn::GestureGenerator &generator, + const XnChar * gesture_name, + const XnPoint3D * position, + const XnPoint3D * end_position, + void * cookie) { OpenNiHandTrackerThread *t = static_cast<OpenNiHandTrackerThread *>(cookie); t->gesture_recognized(gesture_name, position, end_position); } static void XN_CALLBACK_TYPE - cb_gesture_progress(xn::GestureGenerator &generator, - const XnChar * gesture_name, - const XnPoint3D * position, - XnFloat progress, - void * cookie) +cb_gesture_progress(xn::GestureGenerator &generator, + const XnChar * gesture_name, + const XnPoint3D * position, + XnFloat progress, + void * cookie) { OpenNiHandTrackerThread *t = static_cast<OpenNiHandTrackerThread *>(cookie); t->gesture_progress(gesture_name, position, progress); diff --git a/src/plugins/openni/usertracker_thread.cpp b/src/plugins/openni/usertracker_thread.cpp index 17b9fc546..737183f55 100644 --- a/src/plugins/openni/usertracker_thread.cpp +++ b/src/plugins/openni/usertracker_thread.cpp @@ -55,41 +55,41 @@ OpenNiUserTrackerThread::~OpenNiUserTrackerThread() } static void XN_CALLBACK_TYPE - cb_new_user(xn::UserGenerator &generator, XnUserID id, void *cookie) +cb_new_user(xn::UserGenerator &generator, XnUserID id, void *cookie) { OpenNiUserTrackerThread *t = static_cast<OpenNiUserTrackerThread *>(cookie); t->new_user(id); } static void XN_CALLBACK_TYPE - cb_lost_user(xn::UserGenerator &generator, XnUserID id, void *cookie) +cb_lost_user(xn::UserGenerator &generator, XnUserID id, void *cookie) { OpenNiUserTrackerThread *t = static_cast<OpenNiUserTrackerThread *>(cookie); t->lost_user(id); } static void XN_CALLBACK_TYPE - cb_pose_start(xn::PoseDetectionCapability &capability, - const XnChar * pose_name, - XnUserID id, - void * cookie) +cb_pose_start(xn::PoseDetectionCapability &capability, + const XnChar * pose_name, + XnUserID id, + void * cookie) { OpenNiUserTrackerThread *t = static_cast<OpenNiUserTrackerThread *>(cookie); t->pose_start(id, pose_name); } static void XN_CALLBACK_TYPE - cb_pose_end(xn::PoseDetectionCapability &capability, - const XnChar * pose_name, - XnUserID id, - void * cookie) +cb_pose_end(xn::PoseDetectionCapability &capability, + const XnChar * pose_name, + XnUserID id, + void * cookie) { OpenNiUserTrackerThread *t = static_cast<OpenNiUserTrackerThread *>(cookie); t->pose_end(id, pose_name); } static void XN_CALLBACK_TYPE - cb_calibration_start(xn::SkeletonCapability &capability, XnUserID id, void *cookie) +cb_calibration_start(xn::SkeletonCapability &capability, XnUserID id, void *cookie) { OpenNiUserTrackerThread *t = static_cast<OpenNiUserTrackerThread *>(cookie); t->calibration_start(id); @@ -97,17 +97,17 @@ static void XN_CALLBACK_TYPE #if XN_VERSION_GE(1, 3, 2, 0) static void XN_CALLBACK_TYPE - cb_calibration_complete(xn::SkeletonCapability &capability, - XnUserID id, - XnCalibrationStatus status, - void * cookie) +cb_calibration_complete(xn::SkeletonCapability &capability, + XnUserID id, + XnCalibrationStatus status, + void * cookie) { OpenNiUserTrackerThread *t = static_cast<OpenNiUserTrackerThread *>(cookie); t->calibration_end(id, status == XN_CALIBRATION_STATUS_OK); } #else static void XN_CALLBACK_TYPE - cb_calibration_end(xn::SkeletonCapability &capability, XnUserID id, XnBool success, void *cookie) +cb_calibration_end(xn::SkeletonCapability &capability, XnUserID id, XnBool success, void *cookie) { OpenNiUserTrackerThread *t = static_cast<OpenNiUserTrackerThread *>(cookie); t->calibration_end(id, success); - *commit* 550a8aaf9577d9e12c751c7f8e9a912001b65664 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 14 14:26:02 2020 +0200 Subject: openprs: reformat code with clang-format src/plugins/openprs/mod_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/plugins/openprs/mod_utils.h b/src/plugins/openprs/mod_utils.h index eb688625e..cce0393b4 100644 --- a/src/plugins/openprs/mod_utils.h +++ b/src/plugins/openprs/mod_utils.h @@ -58,10 +58,10 @@ Symbol wait_sym; typedef enum { LOGICAL_VARIABLE, PROGRAM_VARIABLE } Variable_Type; struct envar -{ /* Un envar */ - Symbol name; /* son name */ - Term * value; /* le term sur lequel elle pointe */ - Type * unif_type; +{ /* Un envar */ + Symbol name; /* son name */ + Term * value; /* le term sur lequel elle pointe */ + Type * unif_type; Variable_Type type BITFIELDS( : 8); /* Le type de la variable */ }; - *commit* 5324ad4487ed7ad20fbd1d591859d98c097636ca - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 25 10:47:19 2020 +0200 Subject: buildkite: switch to Fedora 32 .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _Diff for modified files_: diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 319048323..6769acf9f 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -6,7 +6,7 @@ merged-pr-plugin: &merged-pr-plugin mode: checkout docker-plugin-base: &docker-plugin-base - image: fawkesrobotics/fawkes-builder:fedora31-melodic + image: fawkesrobotics/fawkes-builder:fedora32-noetic always-pull: true debug: true environment: ["BUILDKITE", "BUILDKITE_LABEL"] - *commit* 5e6cc95d9c1b50b4376f36c3ec725f1d0ada3a8a - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 25 12:46:42 2020 +0200 Subject: utils: remove erroneous documentation for empty return types src/libs/utils/system/argparser.cpp | 2 -- src/libs/utils/system/dynamic_module/module.cpp | 1 - 2 files changed, 3 deletions(-) _Diff for modified files_: diff --git a/src/libs/utils/system/argparser.cpp b/src/libs/utils/system/argparser.cpp index 983192225..88fef0669 100644 --- a/src/libs/utils/system/argparser.cpp +++ b/src/libs/utils/system/argparser.cpp @@ -245,7 +245,6 @@ ArgumentParser::parse_hostport(const char *argn, char **host, unsigned short int * @param host Upon successful return contains a pointer to a newly alloated string * with the hostname part. Free it after you are finished. * @param port upon successful return contains the port part - * @return true, if the argument was supplied, false otherwise * @exception Exception thrown on parsing error */ void @@ -336,7 +335,6 @@ ArgumentParser::parse_hostport(const char *argn, std::string &host, unsigned sho * @param s string to parse * @param host Upon successful return contains the hostname part * @param port upon successful return contains the port part (unchanged if not supplied) - * @return true, if the argument was supplied, false otherwise * @exception OutOfBoundsException thrown if port is not in the range [0..65535] */ void diff --git a/src/libs/utils/system/dynamic_module/module.cpp b/src/libs/utils/system/dynamic_module/module.cpp index b5a026350..3873857d4 100644 --- a/src/libs/utils/system/dynamic_module/module.cpp +++ b/src/libs/utils/system/dynamic_module/module.cpp @@ -79,7 +79,6 @@ Module::~Module() } /** Open the module - * @return true if the module could be opened, false otherwise * @exception ModuleOpenException thrown if there was any problem * while loading the module */ - *commit* cf05c9fdc855218df86d368f947387e7c188eb61 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 25 12:47:59 2020 +0200 Subject: interface: remove erroneous documentation for empty return types src/libs/interface/message_queue.cpp | 1 - 1 file changed, 1 deletion(-) _Diff for modified files_: diff --git a/src/libs/interface/message_queue.cpp b/src/libs/interface/message_queue.cpp index bb84a6cf3..bc7726414 100644 --- a/src/libs/interface/message_queue.cpp +++ b/src/libs/interface/message_queue.cpp @@ -121,7 +121,6 @@ MessageQueue::append(Message *msg) /** Enqueue message after given iterator. * @param it Iterator * @param msg Message to enqueue - * @return message queue id of the appended message. * @exception NullPointerException thrown if iterator is end iterator. * @exception NotLockedException thrown if message queue is not locked during this operation. * @exception MessageAlreadyQueuedException thrown if the message has already been - *commit* 20a644503de378e08dc3234dd62c60e78da91253 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 25 12:49:34 2020 +0200 Subject: openrave: remove erroneous documentation for empty return types src/plugins/openrave/environment.cpp | 3 --- 1 file changed, 3 deletions(-) _Diff for modified files_: diff --git a/src/plugins/openrave/environment.cpp b/src/plugins/openrave/environment.cpp index 07b66b32c..4a6c6fbfb 100644 --- a/src/plugins/openrave/environment.cpp +++ b/src/plugins/openrave/environment.cpp @@ -199,7 +199,6 @@ OpenRaveEnvironment::disable_debug() /** Add a robot into the scene. * @param robot RobotBasePtr of robot to add - * @return 1 if succeeded, 0 if not able to add robot */ void OpenRaveEnvironment::add_robot(OpenRAVE::RobotBasePtr robot) @@ -220,7 +219,6 @@ OpenRaveEnvironment::add_robot(OpenRAVE::RobotBasePtr robot) /** Add a robot into the scene. * @param filename path to robot's xml file - * @return 1 if succeeded, 0 if not able to load file */ void OpenRaveEnvironment::add_robot(const std::string &filename) @@ -245,7 +243,6 @@ OpenRaveEnvironment::add_robot(const std::string &filename) /** Add a robot into the scene. * @param robot pointer to OpenRaveRobot object of robot to add - * @return 1 if succeeded, 0 if not able to add robot */ void OpenRaveEnvironment::add_robot(OpenRaveRobotPtr &robot) - *commit* 290003c13bf808a5e1f582ec57bd17722f29ee74 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 25 12:50:31 2020 +0200 Subject: fvcams: remove erroneous documentation for empty return types src/libs/fvcams/control/sony_evid100p.cpp | 1 - 1 file changed, 1 deletion(-) _Diff for modified files_: diff --git a/src/libs/fvcams/control/sony_evid100p.cpp b/src/libs/fvcams/control/sony_evid100p.cpp index f5edc75d0..270f76d82 100644 --- a/src/libs/fvcams/control/sony_evid100p.cpp +++ b/src/libs/fvcams/control/sony_evid100p.cpp @@ -137,7 +137,6 @@ SonyEviD100PControl::~SonyEviD100PControl() } /** Open visca device. - * @return true on success */ void SonyEviD100PControl::open() - *commit* 7cc59537532ca657bd636e958237d70a52a3facc - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Mon May 25 12:52:23 2020 +0200 Subject: protoboard: remove erroneous documentation for empty return types src/libs/protoboard/blackboard_manager.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/libs/protoboard/blackboard_manager.h b/src/libs/protoboard/blackboard_manager.h index 90ac38f0a..e39c29a50 100644 --- a/src/libs/protoboard/blackboard_manager.h +++ b/src/libs/protoboard/blackboard_manager.h @@ -122,7 +122,7 @@ public: /** Go through all interface managers, empty all blackboard message queues and send out * ProtoBuf messages accordingly. - * @return whether anything was sent */ + */ virtual void process_sending_interfaces() = 0; /// Deferred initialization, coincides with the main thread. @@ -147,7 +147,7 @@ protected: * @tparam IfaceT the interface type handled by the interface manager * @tparam MessageT the current * @param iface_mgr a bb_iface_manager for a specific message type - * @return Whether any ProtoBuf message was sent */ + */ template <class IfaceT, class MessageT> void operator()(const bb_iface_manager<IfaceT, type_list<MessageT>> &iface_mgr) const; @@ -157,7 +157,7 @@ protected: * @tparam MessageT1 First message type in the list * @tparam MessageTs Remaining message types * @param iface_mgr a bb_iface_manager with a list of message type to go through - * @return Whether any ProtoBuf message was sent */ + */ template <class IfaceT, class MessageT1, class... MessageTs> void operator()(const bb_iface_manager<IfaceT, type_list<MessageT1, MessageTs...>> &iface_mgr) const; - *commit* 16807bd94101478b6ef042b503445c68634a7909 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Jun 24 10:03:00 2020 +0200 Subject: pcl_utils: add missing doxygen documentation src/libs/pcl_utils/storage_adapter.h | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) _Diff for modified files_: diff --git a/src/libs/pcl_utils/storage_adapter.h b/src/libs/pcl_utils/storage_adapter.h index cd611e0b8..e75ec7b2e 100644 --- a/src/libs/pcl_utils/storage_adapter.h +++ b/src/libs/pcl_utils/storage_adapter.h @@ -102,50 +102,94 @@ public: return pcl_utils::cloudptr_from_refptr(cloud); } + /** Clone this storage adapter. + * @return A pointer to a copy of this storage adapter. + */ virtual StorageAdapter *clone() const; + /** Transform the point cloud. + * @param target_frame frame to transform to + * @param transformer transformer to get transform from + */ virtual void transform(const std::string &target_frame, const tf::Transformer &transformer); + /** Transform point cloud. + * @param target_frame frame to transform to + * @param target_time time for which to transform + * @param fixed_frame frame fixed over time + * @param transformer transformer to get transform from + */ virtual void transform(const std::string & target_frame, const Time & target_time, const std::string & fixed_frame, const tf::Transformer &transformer); + /** Get typename of storage adapter. + * @return type name + */ virtual const char * get_typename() { return typeid(this).name(); } + + /** Get size of a point. + * @return size in bytes of a single point + */ virtual size_t point_size() const { return sizeof(PointT); } + + /** Get width of point cloud. + * @return width of point cloud + */ virtual unsigned int width() const { return cloud->width; } + + /** Get height of point cloud. + * @return height of point cloud + */ virtual unsigned int height() const { return cloud->height; } + + /** Get numer of points in point cloud. + * @return number of points + */ virtual size_t num_points() const { return cloud->points.size(); } + + /** Get pointer on data. + * @return pointer on data + */ virtual void * data_ptr() const { return &cloud->points[0]; } + + /** Get frame ID of point cloud. + * @return Frame ID of point cloud. + */ virtual std::string frame_id() const { return cloud->header.frame_id; } + + /** Get last capture time. + * @param time upon return contains last capture time + */ virtual void get_time(fawkes::Time &time) const; }; - *commit* 241b0b36ddea893e306c5837dd0c6667bd653664 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Jun 24 10:25:35 2020 +0200 Subject: protobuf_comm: enable template instantiation via type template parameter src/libs/protobuf_comm/message_register.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/libs/protobuf_comm/message_register.h b/src/libs/protobuf_comm/message_register.h index 953368473..5f74612f1 100644 --- a/src/libs/protobuf_comm/message_register.h +++ b/src/libs/protobuf_comm/message_register.h @@ -77,8 +77,10 @@ public: * @param component_id ID of component this message type belongs to * @param msg_type message type */ - template <class MT> - typename std::enable_if<std::is_base_of<google::protobuf::Message, MT>::value, void>::type + template < + class MT, + typename = typename std::enable_if<std::is_base_of<google::protobuf::Message, MT>::value>::type> + void add_message_type(uint16_t component_id, uint16_t msg_type) { KeyType key(component_id, msg_type); @@ -101,8 +103,11 @@ public: * The template parameter must be a sub-class of google::protobuf::Message. * An instance is spawned and kept internally to spawn more on incoming messages. */ - template <class MT> - typename std::enable_if<std::is_base_of<google::protobuf::Message, MT>::value, void>::type + template < + class MT, + typename = + typename std::enable_if<std::is_base_of<google::protobuf::Message, MT>::value, void>::type> + void add_message_type() { MT m; - *commit* 27faab199d2451831015557b075fdfeac6f13946 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Jun 24 10:33:08 2020 +0200 Subject: buildsys: do not use opencv4 etc/buildsys/fvconf.mk | 4 ++++ 1 file changed, 4 insertions(+) _Diff for modified files_: diff --git a/etc/buildsys/fvconf.mk b/etc/buildsys/fvconf.mk index 93fee9ecc..634739c38 100644 --- a/etc/buildsys/fvconf.mk +++ b/etc/buildsys/fvconf.mk @@ -117,6 +117,10 @@ ifeq ($(HAVE_OPENCV),1) VERSION_SPLITTED_OPENCV = $(call split,.,$(VERSION_OPENCV)) VERSION_MAJOR_OPENCV = $(word 1,$(VERSION_SPLITTED_OPENCV)) VERSION_MINOR_OPENCV = $(word 2,$(VERSION_SPLITTED_OPENCV)) + ifeq ($(VERSION_MAJOR_OPENCV),4) + # We do not support opencv4 yet. + HAVE_OPENCV=0 + endif CFLAGS_OPENCV = -DHAVE_OPENCV -Wno-deprecated-declarations \ $(shell $(PKGCONFIG) --cflags 'opencv$(OPENCV_VERSION_SUFFIX)') \ $(CFLAG_W_NO_UNUSED_LOCAL_TYPEDEFS) - *commit* eb1a0a19bf967d253904f1009deb2631c0886368 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Jun 24 10:47:19 2020 +0200 Subject: gazebo: disable TBB compiler warnings src/plugins/gazebo/gazebo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _Diff for modified files_: diff --git a/src/plugins/gazebo/gazebo.mk b/src/plugins/gazebo/gazebo.mk index 5fa1621ef..27de1784c 100644 --- a/src/plugins/gazebo/gazebo.mk +++ b/src/plugins/gazebo/gazebo.mk @@ -32,7 +32,7 @@ ifeq ($(HAVE_GAZEBO),1) # Gazebo 8 declared several symbols as deprecated but still uses them. # Disable the deprecated declarations warning until this is fixed. CFLAGS_GAZEBO = -DHAVE_GAZEBO $(shell $(PKGCONFIG) --cflags 'gazebo') \ - -Wno-deprecated-declarations + -Wno-deprecated-declarations -DTBB_SUPPRESS_DEPRECATED_MESSAGES LDFLAGS_GAZEBO = $(shell $(PKGCONFIG) --libs 'gazebo') -ldl ifeq ($(HAVE_GAZEBO_96)$(boost-have-lib system),11) - *commit* 0229e90ad2929c7218b8b40fdfddd09479246760 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Jun 24 10:52:51 2020 +0200 Subject: gazebo: re-enable warnings for deprecated declarations with gazebo >= 10 src/plugins/gazebo/gazebo.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/plugins/gazebo/gazebo.mk b/src/plugins/gazebo/gazebo.mk index 27de1784c..2feac1db5 100644 --- a/src/plugins/gazebo/gazebo.mk +++ b/src/plugins/gazebo/gazebo.mk @@ -26,13 +26,18 @@ __buildsys_gazebo_mk_ := 1 ifneq ($(PKGCONFIG),) HAVE_GAZEBO = $(if $(shell $(PKGCONFIG) --atleast-version=1.0.1 'gazebo'; echo $${?/1/}),1,0) HAVE_GAZEBO_96 = $(if $(shell $(PKGCONFIG) --atleast-version=9.6.0 'gazebo'; echo $${?/1/}),1,0) + HAVE_GAZEBO_10 = $(if $(shell $(PKGCONFIG) --atleast-version=10 'gazebo'; echo $${?/1/}),1,0) endif ifeq ($(HAVE_GAZEBO),1) - # Gazebo 8 declared several symbols as deprecated but still uses them. - # Disable the deprecated declarations warning until this is fixed. CFLAGS_GAZEBO = -DHAVE_GAZEBO $(shell $(PKGCONFIG) --cflags 'gazebo') \ - -Wno-deprecated-declarations -DTBB_SUPPRESS_DEPRECATED_MESSAGES + -DTBB_SUPPRESS_DEPRECATED_MESSAGES + ifneq ($(HAVE_GAZEBO_101),1) + # Gazebo 8 declared several symbols as deprecated but still uses them. + # Those were fixed in Gazebo 10. + # Disable the deprecated declarations warning with older gazebo versions. + CFLAGS += -Wno-deprecated-declarations + endif LDFLAGS_GAZEBO = $(shell $(PKGCONFIG) --libs 'gazebo') -ldl ifeq ($(HAVE_GAZEBO_96)$(boost-have-lib system),11) - *commit* 2bea96dc5d425fad42ae5fa172d0136dc3c54234 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Jun 24 11:26:07 2020 +0200 Subject: buildsys: conditionalize CGAL build flags on CGAL version etc/buildsys/cgal.mk | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) _Diff for modified files_: diff --git a/etc/buildsys/cgal.mk b/etc/buildsys/cgal.mk index 1cbc63f09..5d3db38d4 100644 --- a/etc/buildsys/cgal.mk +++ b/etc/buildsys/cgal.mk @@ -34,12 +34,24 @@ ifeq ($(CGAL_HAVE_BOOST_LIBS),1) ifneq ($(wildcard $(SYSROOT)/usr/include/mpfr.h $(SYSROOT)/usr/local/include/mpfr.h),) HAVE_CGAL:=1 CFLAGS_CGAL:= -DHAVE_CGAL $(call boost-libs-cflags,$(CGAL_REQ_BOOST_LIBS)) -Wno-deprecated-register - # Disable this runtime check since it fails when using valgrind CFLAGS_CGAL += -DCGAL_DISABLE_ROUNDING_MATH_CHECK + ifneq ($(wildcard $(SYSROOT)/usr/local/include/CGAL/version.h),) + CGAL_VERSION_HEADER=$(SYSROOT)/usr/local/include/CGAL/version.h + else + CGAL_VERSION_HEADER=$(SYSROOT)/usr/include/CGAL/version.h + endif + CGAL_VERSION=$(shell grep -oP "CGAL_VERSION\s+\K.*" $(CGAL_VERSION_HEADER)) + CGAL_VERSION_SPLITTED=$(call split,.,$(CGAL_VERSION)) + CGAL_VERSION_MAJOR=$(word 1,$(CGAL_VERSION_SPLITTED)) + CGAL_VERSION_MINOR=$(word 2,$(CGAL_VERSION_SPLITTED)) + HAVE_CGAL5 = $(if $(call gte,$(CGAL_VERSION_MAJOR),5),1) LDFLAGS_CGAL:=-lgmp -lmpfr -lm \ $(call boost-libs-ldflags,$(REQ_BOOST_LIBS)) + ifneq ($(HAVE_CGAL5),1) + LDFLAGS_CGAL += -lCGAL -lCGAL_Core + endif ifeq ($(CC),clang) CFLAGS_CGAL += -Wno-unused-local-typedef - *commit* deebf037aff6547e878bed91bc89ec985a6dff50 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Jun 24 12:00:33 2020 +0200 Subject: buildsys: use sed instead of GNU grep to detect CGAL version etc/buildsys/cgal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _Diff for modified files_: diff --git a/etc/buildsys/cgal.mk b/etc/buildsys/cgal.mk index 5d3db38d4..06f485a25 100644 --- a/etc/buildsys/cgal.mk +++ b/etc/buildsys/cgal.mk @@ -42,7 +42,7 @@ ifeq ($(CGAL_HAVE_BOOST_LIBS),1) else CGAL_VERSION_HEADER=$(SYSROOT)/usr/include/CGAL/version.h endif - CGAL_VERSION=$(shell grep -oP "CGAL_VERSION\s+\K.*" $(CGAL_VERSION_HEADER)) + CGAL_VERSION=$(shell sed -n -e 's/.*CGAL_VERSION[[:space:]]\(.*\)/\1/p' $(CGAL_VERSION_HEADER)) CGAL_VERSION_SPLITTED=$(call split,.,$(CGAL_VERSION)) CGAL_VERSION_MAJOR=$(word 1,$(CGAL_VERSION_SPLITTED)) CGAL_VERSION_MINOR=$(word 2,$(CGAL_VERSION_SPLITTED)) - *commit* 4923a6c1fda7799ad32b57f84ec9111bd716fd84 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Sep 16 18:37:19 2020 +0200 Subject: Merge pull request #232 from fawkesrobotics/thofmann/fedora32 .buildkite/pipeline.yml | 2 +- etc/buildsys/cgal.mk | 16 +++- etc/buildsys/fvconf.mk | 4 + src/libs/aspect/blocked_timing.cpp | 2 + src/libs/blackboard/blackboard.h | 4 +- src/libs/blackboard/internal/memory_manager.cpp | 3 +- src/libs/config/yaml_node.h | 3 +- src/libs/core/exception.cpp | 3 +- src/libs/core/macros.h | 110 ++++++++++++------------ src/libs/core/utils/circular_buffer.h | 3 +- src/libs/core/utils/lock_hashmap.h | 4 +- src/libs/core/utils/lock_hashset.h | 4 +- src/libs/core/utils/lock_multimap.h | 4 +- src/libs/core/utils/lockptr.h | 6 +- src/libs/core/utils/refptr.h | 6 +- src/libs/fvcams/control/sony_evid100p.cpp | 1 - src/libs/fvmodels/scanlines/beams.cpp | 6 +- src/libs/fvmodels/scanlines/cornerhorizon.cpp | 6 +- src/libs/fvmodels/scanlines/grid.cpp | 6 +- src/libs/fvmodels/scanlines/line_grid.cpp | 6 +- src/libs/fvmodels/scanlines/radial.cpp | 6 +- src/libs/fvmodels/scanlines/star.cpp | 6 +- src/libs/interface/field_iterator.cpp | 3 +- src/libs/interface/message_queue.cpp | 7 +- src/libs/pcl_utils/storage_adapter.h | 44 ++++++++++ src/libs/protoboard/blackboard_manager.h | 14 +-- src/libs/protobuf_comm/message_register.h | 13 ++- src/libs/utils/ipc/shm.cpp | 13 +-- src/libs/utils/misc/autofree.cpp | 3 +- src/libs/utils/system/argparser.cpp | 2 - src/libs/utils/system/dynamic_module/module.cpp | 1 - src/libs/utils/time/time.cpp | 4 +- src/plugins/asp/aspect/clingo_control_manager.h | 1 + src/plugins/gazebo/gazebo.mk | 11 ++- src/plugins/laser-filter/filters/deadspots.cpp | 2 +- src/plugins/openni/handtracker_thread.cpp | 42 ++++----- src/plugins/openni/usertracker_thread.cpp | 32 +++---- src/plugins/openprs/mod_utils.h | 8 +- src/plugins/openrave/environment.cpp | 3 - 39 files changed, 252 insertions(+), 162 deletions(-) _Diff for modified files_: _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
