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 to c9914097f085e409dfb28e28925a3da386bd6c83 (commit) via 3dfa1a18a2b6bb3190aebb986d1f1d3b7ef4e003 (commit) via 6c4d25209351c5e2a84c5bb9dd2f4b7f4ce77ea0 (commit) via aa946b15db96dd0f9037d28fc1de75c3f86a9c77 (commit) via f3b448d575561d47e2378421cc4d5eacbece8828 (commit) via 22dc30a16a6dcc5d386a5956d186b203429b2ea5 (commit) via 0af5a1e646f1db01f4716fecda98e60aa03d608a (commit) via 1eb05b1c98cc98155b3848d2d936211444ae3b6c (commit) via 625855d211b451d47794d50fa93b5d2da4c6db42 (commit) from 296dfc2ef1f39b26cd3d7c2dda7e7faa74a95375 (commit) 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 625855d211b451d47794d50fa93b5d2da4c6db42 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: Thu May 14 14:25:38 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/625855d21 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 1eb05b1c98cc98155b3848d2d936211444ae3b6c 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: Thu May 14 14:25:40 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/1eb05b1c9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 0af5a1e646f1db01f4716fecda98e60aa03d608a 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: Thu May 14 14:25:42 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/0af5a1e64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 22dc30a16a6dcc5d386a5956d186b203429b2ea5 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: Thu May 14 14:25:44 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/22dc30a16 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f3b448d575561d47e2378421cc4d5eacbece8828 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: Thu May 14 14:25:46 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/f3b448d57 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit aa946b15db96dd0f9037d28fc1de75c3f86a9c77 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: Thu May 14 14:25:48 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/aa946b15d - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 6c4d25209351c5e2a84c5bb9dd2f4b7f4ce77ea0 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: Thu May 14 14:25: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/6c4d25209 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3dfa1a18a2b6bb3190aebb986d1f1d3b7ef4e003 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: Thu May 14 14:26:00 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/3dfa1a18a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit c9914097f085e409dfb28e28925a3da386bd6c83 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: Thu May 14 14:26:02 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/c9914097f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- 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/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 | 6 +- src/libs/protoboard/blackboard_manager.h | 8 +- src/libs/utils/misc/autofree.cpp | 3 +- src/plugins/openni/handtracker_thread.cpp | 42 ++++----- src/plugins/openni/usertracker_thread.cpp | 32 +++---- src/plugins/openprs/mod_utils.h | 8 +- 24 files changed, 156 insertions(+), 132 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* 625855d211b451d47794d50fa93b5d2da4c6db42 - - - - - - - - - - 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* 1eb05b1c98cc98155b3848d2d936211444ae3b6c - - - - - - - - - - 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* 0af5a1e646f1db01f4716fecda98e60aa03d608a - - - - - - - - - - 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* 22dc30a16a6dcc5d386a5956d186b203429b2ea5 - - - - - - - - - - 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* f3b448d575561d47e2378421cc4d5eacbece8828 - - - - - - - - - - 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* aa946b15db96dd0f9037d28fc1de75c3f86a9c77 - - - - - - - - - - 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* 6c4d25209351c5e2a84c5bb9dd2f4b7f4ce77ea0 - - - - - - - - - - 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* 3dfa1a18a2b6bb3190aebb986d1f1d3b7ef4e003 - - - - - - - - - - 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* c9914097f085e409dfb28e28925a3da386bd6c83 - - - - - - - - - - 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 */ }; _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
