Changes have been pushed for the repository "fawkesrobotics/fawkes".
Clone: https://github.com/fawkesrobotics/fawkes.git Gitweb: https://github.com/fawkesrobotics/fawkes The branch, thofmann/fedora32 has been updated discards 4ab834bbd1e2d7c7f2be75b0132d766e1607d26c (commit) discards 67ff6d470e58e3ebfec2b778b6f220ec8433d38c (commit) discards eb973fa84637d90528cbe2ac1675d8e704f5c072 (commit) discards 21c726107f5376f7bcbb0c48a7859723719f5c6e (commit) discards 0297fe01d91a769ce73a900a1d851925fe2f71a6 (commit) discards 5e4ab758d8da5a20de26970c473f23435f99117a (commit) discards 4fc75be473ba7bd56cd7d6d748900b49b0941933 (commit) discards 42c793cd60ba3717cf03407e4468c4fb0c379d38 (commit) discards 7c280d2821826b725a61758b1de57d7f1cb44c3f (commit) discards 8bc45e9bc4a907ebd1b63d37428c24d24aa26acc (commit) discards 52b1903e80df7962340fa471e83c7edfaa35b673 (commit) discards 82b7e2421fc6e2ed7b5a510bb1cb7aada160ea03 (commit) discards c9914097f085e409dfb28e28925a3da386bd6c83 (commit) discards 3dfa1a18a2b6bb3190aebb986d1f1d3b7ef4e003 (commit) discards 6c4d25209351c5e2a84c5bb9dd2f4b7f4ce77ea0 (commit) discards aa946b15db96dd0f9037d28fc1de75c3f86a9c77 (commit) discards f3b448d575561d47e2378421cc4d5eacbece8828 (commit) discards 22dc30a16a6dcc5d386a5956d186b203429b2ea5 (commit) discards 0af5a1e646f1db01f4716fecda98e60aa03d608a (commit) discards 1eb05b1c98cc98155b3848d2d936211444ae3b6c (commit) discards 625855d211b451d47794d50fa93b5d2da4c6db42 (commit) discards 296dfc2ef1f39b26cd3d7c2dda7e7faa74a95375 (commit) discards cda0482c2657c825025d36e62b1c9a252cc2044b (commit) discards eebbbd709475522ee20d794b7dbdf498710a5162 (commit) discards 9f572b4823d50f78dd4cce8863f1994c5c683a6d (commit) discards 32cd69a21bf7cbef573330d1d3e9c843099a9861 (commit) to 1eb31f20c837e1aea4992b66cccaadff623336e8 (commit) via 9bb63e54b07d5cd443d06619ec1c69eca645eb65 (commit) via f65372a94cc2ec61ec95327d5a5994871540a63d (commit) via 7cc4a13df9c631feb2dd7853863cb71ce72de13c (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) via 41e62ffdda695acb74c025b6109a6e320fbe6534 (commit) via 9d7e944c29c93c7bf3de12f122544d21e64ed053 (commit) via 158555237362d8de4316340e577a85bebd031189 (commit) via 68a98901e1b47d2165ee832a012e1849ba550a81 (commit) via 3e2b6874e4e60f0b18e555dd5133f556d08f4282 (commit) via 8ecbf1073c2f6ddca1f6623fd9c58c9bfe5d4bfe (commit) via abcbf04730196722d1c5c012a1a167c23be68fe2 (commit) via edc998ce6b7eead0585b6ab2f29cd7047c4ceb0b (commit) via 43797b0f88d5771c8b029b2a08b3aadbd4c64f1f (commit) via d100bffa49be6efa274fc1464d7613dedf209dda (commit) via d0329993154e1f10c5db933ec7457378ff0d4b13 (commit) via 174b9a7c02269d72661a13b702c29c7b8756f9c7 (commit) via 6f7d1b147c89ab9e82f7f63baf2e6069a2bbbd7d (commit) via 000bfe05d2935bb9f7e60ae1b968768937886b51 (commit) via 99756727467947648c8fc959edf1a396f505b313 (commit) via 2d3b8ebd4160d7b1ad034f22f695ab22c8ecfe96 (commit) via 0700edd831db9519168cf543d803731da2cae994 (commit) via f85f767bc78bd6cf0638bcad4f49687427fc2c80 (commit) via 1b85fdd4a422266316d22d5279b075d4d5fdd8e6 (commit) via f36dfd56c1a7dbf39d027c458f0137532ec00f94 (commit) via bb1176fbe94156f85dcbcf7b997fd42178accd3e (commit) via 1d328a7db48418c4cbe3af2d81e6cb22ad0e7da0 (commit) via c4a305e83aa315133ba43d89dfac5e0f77e5675f (commit) via b8b61cc1fc6e5c07968ff022716ee96933c92fff (commit) via 51477f788ce307964fc84f39a62eb80494edb8aa (commit) via 976c3384e52946e1694726c529990d0200671ade (commit) via eafad9709a14c7130edd163ff1b4589e1eeb4e8f (commit) via 02f53e82574a421e1f15b619449999941837373d (commit) via 065dadcdd79a2d051ce5d5c7a4700be11001c748 (commit) via eed73b0343fe8b61e3d42454ab823cea562ee22c (commit) via 1b2a7ff5493ea010861e0fcc33a98c0697df752f (commit) via 054d888d636e7086b6e4eb376a1e0c834696cb0c (commit) via fa4d9d2c13c8fb04ad9c24f3f4ded9ae8fe2d891 (commit) via d865379d8f0ba284d01f2216dce03e1b7cbc7f23 (commit) via 916458681da13f9116ba1b3917f7c915f05bf0f8 (commit) via 112871845c7e89860e5a30c74e3fc874b211ef69 (commit) via fbbe88ac82c9a7b53b177cceefe5c60a691da9fa (commit) via 8b6f16f71e9a9c3db3da5f050256029752050e7c (commit) via 821b3c86945972361b36a21a991937cbf14c87bb (commit) via aa6afb26a971dadb13d7dff477377a5b77cf3900 (commit) via 841748e76934513c3ff1018c9db2e3b0b9904d88 (commit) via 574ab1dcc655092015d3ea1162a4ada7e587a379 (commit) via 17ad37a884f88c63ec4d4e13c47628c64243eaf0 (commit) via eb661d7ddc0e11abbcc29a21cae1b0179b54f656 (commit) via 771603c2b22641455d9de6e355d495e45bb2692c (commit) via 983c2af0c56219482d2134885f7d2fed2e0166b3 (commit) via 8aed7dcf64509a9f16587d63ac0ca77b483881a7 (commit) via d07b3cc6ea028b061dcd72de6246c5f0a598a56f (commit) via 552e337733dcc423a9e46b6cf746c1f670e13e08 (commit) via dac079a740d8d994055a76d892d532c8d5e63d14 (commit) via ba7f38e87ee187c4b20a156300f07c2a00cade4a (commit) via 0347e6e77f5b9ef1c9475f4e5067e54d29383cc3 (commit) via 1423916b0c0794c4eb6f75bb6221ecad1457ce9a (commit) via cbf1c9be426902101920d1905186518060761c27 (commit) via 3308a4a7f378d31a52b9fe463a21e540f57b4e17 (commit) via cfb7dd924a2f388bc702b981b37205462c452967 (commit) via 159518603089593bec2639e02390bceba0a17362 (commit) via 4d27bf53ecbc5a222d42cc63ba6dea2ed59cd8d9 (commit) via a44a3503d9c7c2909a23174494798d6b4bf334d1 (commit) via 27a5bb6a105e8299d6f0ab7288dd590585b8d908 (commit) via 7e44c3ad0b09f68eec5e1e274b34186d204e8020 (commit) via 0e0af61dc3302d3834daca29be53c1783edfd47d (commit) via 7172954d994058111997942f71e188cb5651cbd4 (commit) via 3dd7bcbae5f7c0ddc56158373cf28726dd50cfed (commit) via a87e3750a718dc27a80f887eb22cef4ba0341a50 (commit) via 70fda9bc1105a3f6850530570be5e8fbbd57d924 (commit) via 80c9dedc365bed1abedf42e3eaf6b03c21dcd994 (commit) via 1c6b3ebb48f3d128a1fb09c65f31e82b158f0339 (commit) via 2d90d1f5c9393588f698820a295e35f4f9d07f57 (commit) via 158a37c92013ea9790187d21135ad578f39b71bc (commit) via 99ae21b2984c4ef9a8eaf4ccd62fda84496a04a3 (commit) via 095fbd7f012ace3c0883ecbb8e62103b4ff3a00f (commit) via 04b09440788053b4ef539fd14ac33de31a2744b4 (commit) via dd868135105608f844721acd11b2bcf2a636aded (commit) via a719e2620c7a479d31d75f2fa6eaeb52a6540da4 (commit) via 0cf87ced955be71c552748caf9145df77d0dc23a (commit) via f92b4868c283aeed72271dc3071c31c2e8a757e3 (commit) via d117df112fba72753f59d0d642bf1efca987b974 (commit) via ac763e53a8869709c345cfadfe7481ee88151c36 (commit) via d77c834f1265f8ab83d013a1d1421635f5c152fa (commit) via 390263c33317b32f125bcf867f9e6285a0f8e14d (commit) via 0f46eeeb469a68e0033be13ae31518130d934c70 (commit) via 8a91719135bc95cdf870476c245a69843e2fb5ed (commit) via cf7193eac383384fab0150cc3e7b98c7283f8fa7 (commit) via 1a837bb2f70dfc713d9d2c688a91aad0f411bab4 (commit) via 3abb61226300c154a49b72e908a494ef49d964ce (commit) via 83d6fc4fe54a56d4573138fe3d591ba881bbb45e (commit) via 490344765a4aa718bc8a1527d7cbe9e2e8cbe708 (commit) via b4c552032b4541a05395d36b40bfb58a32af889d (commit) via e1c3cb48a034d0d37e742fd82eb5bcfe981eb802 (commit) via 198d31f910c2d53cfb125d3c5136d61af2dc9aef (commit) via 0791bf5cfed612086fd102b9e141f83e04cec634 (commit) via e0c565788b67ed694212a765167002dd1c1b812c (commit) via ecca5021498dfabdcd97c349066874cdf83edbd7 (commit) via bacda9813c15bf41b97939518933a745f666b21e (commit) via a2e3fcff2524d13dad4dfc56dd880afdc54a5965 (commit) via 4d608b59dd9f633eddfc10bad8a3b50be5923de4 (commit) via 0df1ca17e64a925a33888321328f5d49555a1cf8 (commit) via 4870322cf6b634cbfc03286f3aac9e4b799fc213 (commit) via ee65a0a267594751881d19d5f75664c9876aca07 (commit) via ebab73211d7183ba5b7d7ba4df5ba25167d1cc92 (commit) via 39324a53269aea349cb976f2da7bf4f89f345134 (commit) via b92ede886813ea925019fa8b45582bcf59a1d995 (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 (4ab834bbd1e2d7c7f2be75b0132d766e1607d26c) \ N -- N -- N (1eb31f20c837e1aea4992b66cccaadff623336e8) 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. https://github.com/fawkesrobotics/fawkes/tree/thofmann/fedora32 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 7cc4a13df9c631feb2dd7853863cb71ce72de13c 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 10:59:50 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/7cc4a13df - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f65372a94cc2ec61ec95327d5a5994871540a63d 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 10:59:50 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/f65372a94 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 9bb63e54b07d5cd443d06619ec1c69eca645eb65 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 10:59:50 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/9bb63e54b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 1eb31f20c837e1aea4992b66cccaadff623336e8 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 10:59:50 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/1eb31f20c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- cfg/conf.d/execution-time-estimator.yaml | 76 +++++ cfg/conf.d/mongodb.yaml | 4 + cfg/conf.d/robot-memory.yaml | 2 - cfg/conf.d/skiller-simulator.yaml | 12 - etc/buildsys/gcc.mk | 4 + etc/buildsys/root/check.mk | 2 +- etc/buildsys/root/linkscripts.mk | 27 +- etc/scripts/mongodb_skillsim_lookup.py | 154 ++++++++++ src/libs/Makefile | 3 +- .../execution_time_estimator}/Makefile | 31 +- .../execution_time_estimator/aspect}/Makefile | 32 +-- .../aspect/execution_time_estimator.cpp} | 63 ++-- .../aspect/execution_time_estimator.h} | 17 +- .../aspect/execution_time_estimator_inifin.cpp} | 4 +- .../aspect/execution_time_estimator_inifin.h} | 7 +- .../execution_time_estimator.cpp | 317 +++++++++++++++++++++ .../execution_time_estimator.h | 107 +++++++ .../execution_time_estimator}/tests/Makefile | 15 +- .../tests/test_skill_parser.cpp | 2 +- src/libs/pcl_utils/comparisons.h | 10 +- .../pcl_utils/compatibility.h} | 28 +- src/libs/pcl_utils/utils.h | 116 +------- src/libs/protoboard/protobuf_thread.cpp | 1 + src/libs/protobuf_clips/communicator.cpp | 1 + src/libs/protobuf_comm/peer.cpp | 1 + src/libs/utils/sub_process/proc.cpp | 2 +- src/plugins/Makefile | 10 +- .../execution-time-estimator-lookup/Makefile | 57 ++++ .../lookup_estimator.cpp | 177 ++++++++++++ .../lookup_estimator.h | 75 +++++ .../lookup_plugin.cpp} | 23 +- .../lookup_thread.cpp | 50 ++++ .../lookup_thread.h | 45 +++ .../Makefile | 17 +- .../execution_time_estimator_navgraph_plugin.cpp} | 14 +- .../execution_time_estimator_navgraph_thread.cpp} | 26 +- .../execution_time_estimator_navgraph_thread.h} | 23 +- .../navgraph_estimator.cpp | 39 ++- .../navgraph_estimator.h | 24 +- .../Makefile | 24 +- .../estimators/config_estimator.cpp | 37 ++- .../estimators/config_estimator.h | 19 +- .../execution_time_estimator_plugin.cpp} | 27 +- .../execution_time_estimator_thread.cpp | 46 +++ .../execution_time_estimator_thread.h} | 29 +- .../gazebo/gazsim-comm/gazsim_comm_thread.cpp | 1 + src/plugins/imu/imu_cruizcore_xg1010.cpp | 2 +- src/plugins/mongodb/mongodb_client_config.cpp | 23 +- src/plugins/mongodb/mongodb_client_config.h | 1 + .../perception/pcl-db/pcl_db_merge_pipeline.h | 2 +- .../robot-memory/computables/computables_manager.h | 4 +- src/plugins/robot-memory/event_trigger_manager.h | 4 +- src/plugins/robot-memory/robot_memory.cpp | 32 +-- src/plugins/robot-memory/robot_memory.h | 5 +- src/plugins/skiller-simulator/Makefile | 15 +- src/plugins/skiller-simulator/exec_thread.cpp | 40 +-- src/plugins/skiller-simulator/exec_thread.h | 16 +- .../skiller-simulator/execution_time_estimator.cpp | 100 ------- .../skiller-simulator/execution_time_estimator.h | 57 ---- src/tools/laser_calibration/laser_calibration.cpp | 2 +- 60 files changed, 1512 insertions(+), 592 deletions(-) create mode 100644 cfg/conf.d/execution-time-estimator.yaml delete mode 100644 cfg/conf.d/skiller-simulator.yaml create mode 100755 etc/scripts/mongodb_skillsim_lookup.py copy src/{plugins/skiller-simulator-navgraph => libs/execution_time_estimator}/Makefile (55%) copy src/{plugins/skiller-simulator-navgraph => libs/execution_time_estimator/aspect}/Makefile (50%) rename src/{plugins/skiller-simulator/execution_time_estimator_aspect/execution_time_estimator_aspect.cpp => libs/execution_time_estimator/aspect/execution_time_estimator.cpp} (52%) rename src/{plugins/skiller-simulator/execution_time_estimator_aspect/execution_time_estimator_aspect.h => libs/execution_time_estimator/aspect/execution_time_estimator.h} (79%) rename src/{plugins/skiller-simulator/execution_time_estimator_aspect/execution_time_estimator_aspect_inifin.cpp => libs/execution_time_estimator/aspect/execution_time_estimator_inifin.cpp} (95%) rename src/{plugins/skiller-simulator/execution_time_estimator_aspect/execution_time_estimator_aspect_inifin.h => libs/execution_time_estimator/aspect/execution_time_estimator_inifin.h} (89%) create mode 100644 src/libs/execution_time_estimator/execution_time_estimator.cpp create mode 100644 src/libs/execution_time_estimator/execution_time_estimator.h rename src/{plugins/skiller-simulator => libs/execution_time_estimator}/tests/Makefile (66%) rename src/{plugins/skiller-simulator => libs/execution_time_estimator}/tests/test_skill_parser.cpp (96%) copy src/{plugins/gazebo/gazebo_plugin.h => libs/pcl_utils/compatibility.h} (68%) create mode 100644 src/plugins/execution-time-estimator-lookup/Makefile create mode 100644 src/plugins/execution-time-estimator-lookup/lookup_estimator.cpp create mode 100644 src/plugins/execution-time-estimator-lookup/lookup_estimator.h copy src/plugins/{skiller-simulator-navgraph/skiller_simulator_navgraph_plugin.cpp => execution-time-estimator-lookup/lookup_plugin.cpp} (55%) create mode 100644 src/plugins/execution-time-estimator-lookup/lookup_thread.cpp create mode 100644 src/plugins/execution-time-estimator-lookup/lookup_thread.h copy src/plugins/{skiller-simulator-navgraph => execution-time-estimator-navgraph}/Makefile (62%) copy src/plugins/{skiller-simulator-navgraph/skiller_simulator_navgraph_plugin.cpp => execution-time-estimator-navgraph/execution_time_estimator_navgraph_plugin.cpp} (70%) rename src/plugins/{skiller-simulator-navgraph/skiller_simulator_navgraph_thread.cpp => execution-time-estimator-navgraph/execution_time_estimator_navgraph_thread.cpp} (56%) copy src/plugins/{skiller-simulator-navgraph/skiller_simulator_navgraph_thread.h => execution-time-estimator-navgraph/execution_time_estimator_navgraph_thread.h} (59%) rename src/plugins/{skiller-simulator-navgraph => execution-time-estimator-navgraph}/navgraph_estimator.cpp (55%) rename src/plugins/{skiller-simulator-navgraph => execution-time-estimator-navgraph}/navgraph_estimator.h (65%) rename src/plugins/{skiller-simulator-navgraph => execution-time-estimator}/Makefile (55%) rename src/plugins/{skiller-simulator => execution-time-estimator}/estimators/config_estimator.cpp (57%) rename src/plugins/{skiller-simulator => execution-time-estimator}/estimators/config_estimator.h (72%) rename src/plugins/{skiller-simulator-navgraph/skiller_simulator_navgraph_plugin.cpp => execution-time-estimator/execution_time_estimator_plugin.cpp} (54%) create mode 100644 src/plugins/execution-time-estimator/execution_time_estimator_thread.cpp rename src/plugins/{skiller-simulator-navgraph/skiller_simulator_navgraph_thread.h => execution-time-estimator/execution_time_estimator_thread.h} (53%) delete mode 100644 src/plugins/skiller-simulator/execution_time_estimator.cpp delete mode 100644 src/plugins/skiller-simulator/execution_time_estimator.h - *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* 7cc4a13df9c631feb2dd7853863cb71ce72de13c - - - - - - - - - - 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 | 11 +++++++---- 1 file changed, 7 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..0dcf7d162 100644 --- a/src/libs/protobuf_comm/message_register.h +++ b/src/libs/protobuf_comm/message_register.h @@ -77,8 +77,9 @@ 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 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 +102,10 @@ 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 std::enable_if<std::is_base_of<google::protobuf::Message, MT>::value, void>::type> + void add_message_type() { MT m; - *commit* f65372a94cc2ec61ec95327d5a5994871540a63d - - - - - - - - - - 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* 9bb63e54b07d5cd443d06619ec1c69eca645eb65 - - - - - - - - - - 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* 1eb31f20c837e1aea4992b66cccaadff623336e8 - - - - - - - - - - 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) _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
