Skip to content

Commit

Permalink
gitlab-ci: fix url
Browse files Browse the repository at this point in the history
  • Loading branch information
nim65s committed Oct 24, 2023
1 parent 8bdb610 commit 388a97c
Show file tree
Hide file tree
Showing 160 changed files with 494 additions and 485 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include: http://rainboard.laas.fr/project/hpp-fcl/.gitlab-ci.yml
include: https://rainboard.laas.fr/project/hpp-fcl/.gitlab-ci.yml
5 changes: 2 additions & 3 deletions doc/python/doxygen.hh
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#ifndef DOXYGEN_DOC_HH
#define DOXYGEN_DOC_HH

#include <boost/preprocessor/repetition.hpp>
#include <boost/preprocessor/punctuation/comma_if.hpp>

#include <boost/mpl/void.hpp>
#include <boost/preprocessor/punctuation/comma_if.hpp>
#include <boost/preprocessor/repetition.hpp>

#ifndef DOXYGEN_DOC_MAX_NUMBER_OF_ARGUMENTS_IN_CONSTRUCTOR
#define DOXYGEN_DOC_MAX_NUMBER_OF_ARGUMENTS_IN_CONSTRUCTOR 10
Expand Down
4 changes: 2 additions & 2 deletions include/hpp/fcl/BV/BV.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
#ifndef HPP_FCL_BV_H
#define HPP_FCL_BV_H

#include <hpp/fcl/BV/kDOP.h>
#include <hpp/fcl/BV/AABB.h>
#include <hpp/fcl/BV/OBB.h>
#include <hpp/fcl/BV/RSS.h>
#include <hpp/fcl/BV/OBBRSS.h>
#include <hpp/fcl/BV/RSS.h>
#include <hpp/fcl/BV/kDOP.h>
#include <hpp/fcl/BV/kIOS.h>
#include <hpp/fcl/math/transform.h>

Expand Down
2 changes: 1 addition & 1 deletion include/hpp/fcl/BV/BV_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
#ifndef HPP_FCL_BV_NODE_H
#define HPP_FCL_BV_NODE_H

#include <hpp/fcl/BV/BV.h>
#include <hpp/fcl/data_types.h>

#include <hpp/fcl/BV/BV.h>
#include <iostream>

namespace hpp {
Expand Down
1 change: 1 addition & 0 deletions include/hpp/fcl/BV/RSS.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#define HPP_FCL_RSS_H

#include <hpp/fcl/data_types.h>

#include <boost/math/constants/constants.hpp>

namespace hpp {
Expand Down
3 changes: 2 additions & 1 deletion include/hpp/fcl/BV/kDOP.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@
#ifndef HPP_FCL_KDOP_H
#define HPP_FCL_KDOP_H

#include <hpp/fcl/fwd.hh>
#include <hpp/fcl/data_types.h>

#include <hpp/fcl/fwd.hh>

namespace hpp {
namespace fcl {

Expand Down
3 changes: 1 addition & 2 deletions include/hpp/fcl/BVH/BVH_front.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@
#ifndef HPP_FCL_BVH_FRONT_H
#define HPP_FCL_BVH_FRONT_H

#include <list>

#include <hpp/fcl/config.hh>
#include <list>

namespace hpp {
namespace fcl {
Expand Down
7 changes: 4 additions & 3 deletions include/hpp/fcl/BVH/BVH_model.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@
#ifndef HPP_FCL_BVH_MODEL_H
#define HPP_FCL_BVH_MODEL_H

#include <hpp/fcl/fwd.hh>
#include <hpp/fcl/collision_object.h>
#include <hpp/fcl/BVH/BVH_internal.h>
#include <hpp/fcl/BV/BV_node.h>
#include <hpp/fcl/BVH/BVH_internal.h>
#include <hpp/fcl/collision_object.h>

#include <hpp/fcl/fwd.hh>
#include <vector>

namespace hpp {
Expand Down
7 changes: 3 additions & 4 deletions include/hpp/fcl/broadphase/broadphase.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@
#ifndef HPP_FCL_BROADPHASE_BROADPHASE_H
#define HPP_FCL_BROADPHASE_BROADPHASE_H

#include "hpp/fcl/broadphase/broadphase_SSaP.h"
#include "hpp/fcl/broadphase/broadphase_SaP.h"
#include "hpp/fcl/broadphase/broadphase_bruteforce.h"
#include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h"
#include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h"
#include "hpp/fcl/broadphase/broadphase_bruteforce.h"
#include "hpp/fcl/broadphase/broadphase_SaP.h"
#include "hpp/fcl/broadphase/broadphase_SSaP.h"
#include "hpp/fcl/broadphase/broadphase_interval_tree.h"
#include "hpp/fcl/broadphase/broadphase_spatialhash.h"

#include "hpp/fcl/broadphase/default_broadphase_callbacks.h"

#endif // ifndef HPP_FCL_BROADPHASE_BROADPHASE_H
1 change: 1 addition & 0 deletions include/hpp/fcl/broadphase/broadphase_SSaP.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#define HPP_FCL_BROAD_PHASE_SSAP_H

#include <vector>

#include "hpp/fcl/broadphase/broadphase_collision_manager.h"

namespace hpp {
Expand Down
2 changes: 1 addition & 1 deletion include/hpp/fcl/broadphase/broadphase_SaP.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
#ifndef HPP_FCL_BROAD_PHASE_SAP_H
#define HPP_FCL_BROAD_PHASE_SAP_H

#include <map>
#include <list>
#include <map>

#include "hpp/fcl/broadphase/broadphase_collision_manager.h"

Expand Down
1 change: 1 addition & 0 deletions include/hpp/fcl/broadphase/broadphase_bruteforce.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#define HPP_FCL_BROAD_PHASE_BRUTE_FORCE_H

#include <list>

#include "hpp/fcl/broadphase/broadphase_collision_manager.h"

namespace hpp {
Expand Down
2 changes: 1 addition & 1 deletion include/hpp/fcl/broadphase/broadphase_callbacks.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
#ifndef HPP_FCL_BROADPHASE_BROAD_PHASE_CALLBACKS_H
#define HPP_FCL_BROADPHASE_BROAD_PHASE_CALLBACKS_H

#include "hpp/fcl/fwd.hh"
#include "hpp/fcl/data_types.h"
#include "hpp/fcl/fwd.hh"

namespace hpp {
namespace fcl {
Expand Down
4 changes: 2 additions & 2 deletions include/hpp/fcl/broadphase/broadphase_collision_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
#ifndef HPP_FCL_BROADPHASE_BROADPHASECOLLISIONMANAGER_H
#define HPP_FCL_BROADPHASE_BROADPHASECOLLISIONMANAGER_H

#include <boost/function.hpp>
#include <set>
#include <vector>
#include <boost/function.hpp>

#include "hpp/fcl/collision_object.h"
#include "hpp/fcl/broadphase/broadphase_callbacks.h"
#include "hpp/fcl/collision_object.h"

namespace hpp {
namespace fcl {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@
#ifndef HPP_FCL_BROADPHASE_BROADPHASECONTINUOUSCOLLISIONMANAGER_INL_H
#define HPP_FCL_BROADPHASE_BROADPHASECONTINUOUSCOLLISIONMANAGER_INL_H

#include "hpp/fcl/broadphase/broadphase_continuous_collision_manager.h"
#include <algorithm>

#include "hpp/fcl/broadphase/broadphase_continuous_collision_manager.h"

namespace hpp {
namespace fcl {

Expand Down
4 changes: 2 additions & 2 deletions include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
#ifndef HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_INL_H
#define HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_INL_H

#include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h"

#include <limits>

#include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h"

#if HPP_FCL_HAVE_OCTOMAP
#include "hpp/fcl/octree.h"
#endif
Expand Down
2 changes: 1 addition & 1 deletion include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
#ifndef HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_H
#define HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_H

#include <unordered_map>
#include <functional>
#include <unordered_map>

#include "hpp/fcl/fwd.hh"
// #include "hpp/fcl/BV/utility.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
#ifndef HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_ARRAY_H
#define HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_ARRAY_H

#include <unordered_map>
#include <functional>
#include <limits>
#include <unordered_map>

#include "hpp/fcl/fwd.hh"
// #include "hpp/fcl/BV/utility.h"
Expand Down
1 change: 1 addition & 0 deletions include/hpp/fcl/broadphase/broadphase_spatialhash.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

#include <list>
#include <map>

#include "hpp/fcl/BV/AABB.h"
#include "hpp/fcl/broadphase/broadphase_collision_manager.h"
#include "hpp/fcl/broadphase/detail/simple_hash_table.h"
Expand Down
7 changes: 4 additions & 3 deletions include/hpp/fcl/broadphase/detail/hierarchy_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@
#ifndef HPP_FCL_HIERARCHY_TREE_H
#define HPP_FCL_HIERARCHY_TREE_H

#include <vector>
#include <map>
#include <functional>
#include <iostream>
#include "hpp/fcl/warning.hh"
#include <map>
#include <vector>

#include "hpp/fcl/BV/AABB.h"
#include "hpp/fcl/broadphase/detail/morton.h"
#include "hpp/fcl/broadphase/detail/node_base.h"
#include "hpp/fcl/warning.hh"

namespace hpp {
namespace fcl {
Expand Down
4 changes: 2 additions & 2 deletions include/hpp/fcl/broadphase/detail/hierarchy_tree_array-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
#ifndef HPP_FCL_HIERARCHY_TREE_ARRAY_INL_H
#define HPP_FCL_HIERARCHY_TREE_ARRAY_INL_H

#include "hpp/fcl/broadphase/detail/hierarchy_tree_array.h"

#include <algorithm>
#include <iostream>

#include "hpp/fcl/broadphase/detail/hierarchy_tree_array.h"

namespace hpp {
namespace fcl {

Expand Down
6 changes: 3 additions & 3 deletions include/hpp/fcl/broadphase/detail/hierarchy_tree_array.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
#ifndef HPP_FCL_HIERARCHY_TREE_ARRAY_H
#define HPP_FCL_HIERARCHY_TREE_ARRAY_H

#include <vector>
#include <map>
#include <functional>
#include <map>
#include <vector>

#include "hpp/fcl/fwd.hh"
#include "hpp/fcl/BV/AABB.h"
#include "hpp/fcl/broadphase/detail/morton.h"
#include "hpp/fcl/broadphase/detail/node_base_array.h"
#include "hpp/fcl/fwd.hh"

namespace hpp {
namespace fcl {
Expand Down
2 changes: 1 addition & 1 deletion include/hpp/fcl/broadphase/detail/interval_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
#ifndef HPP_FCL_INTERVAL_TREE_H
#define HPP_FCL_INTERVAL_TREE_H

#include <cstdlib>
#include <deque>
#include <limits>
#include <cstdlib>

#include "hpp/fcl/broadphase/detail/interval_tree_node.h"

Expand Down
6 changes: 3 additions & 3 deletions include/hpp/fcl/broadphase/detail/interval_tree_node-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
#ifndef HPP_FCL_BROADPHASE_DETAIL_INTERVALTREENODE_INL_H
#define HPP_FCL_BROADPHASE_DETAIL_INTERVALTREENODE_INL_H

#include "hpp/fcl/broadphase/detail/interval_tree_node.h"

#include <iostream>
#include <algorithm>
#include <iostream>

#include "hpp/fcl/broadphase/detail/interval_tree_node.h"

namespace hpp {
namespace fcl {
Expand Down
3 changes: 2 additions & 1 deletion include/hpp/fcl/broadphase/detail/morton.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@
#ifndef HPP_FCL_MORTON_H
#define HPP_FCL_MORTON_H

#include "hpp/fcl/BV/AABB.h"
#include <bitset>

#include "hpp/fcl/BV/AABB.h"

namespace hpp {
namespace fcl {

Expand Down
4 changes: 2 additions & 2 deletions include/hpp/fcl/broadphase/detail/simple_hash_table-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
#ifndef HPP_FCL_BROADPHASE_SIMPLEHASHTABLE_INL_H
#define HPP_FCL_BROADPHASE_SIMPLEHASHTABLE_INL_H

#include "hpp/fcl/broadphase/detail/simple_hash_table.h"

#include <iterator>

#include "hpp/fcl/broadphase/detail/simple_hash_table.h"
namespace hpp {
namespace fcl {

Expand Down
2 changes: 1 addition & 1 deletion include/hpp/fcl/broadphase/detail/simple_hash_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
#ifndef HPP_FCL_BROADPHASE_SIMPLEHASHTABLE_H
#define HPP_FCL_BROADPHASE_SIMPLEHASHTABLE_H

#include <list>
#include <set>
#include <vector>
#include <list>

namespace hpp {
namespace fcl {
Expand Down
3 changes: 2 additions & 1 deletion include/hpp/fcl/broadphase/detail/simple_interval-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@
#ifndef HPP_FCL_BROADPHASE_DETAIL_SIMPLEINTERVAL_INL_H
#define HPP_FCL_BROADPHASE_DETAIL_SIMPLEINTERVAL_INL_H

#include "hpp/fcl/broadphase/detail/simple_interval.h"
#include <algorithm>

#include "hpp/fcl/broadphase/detail/simple_interval.h"

namespace hpp {
namespace fcl {
namespace detail {
Expand Down
2 changes: 1 addition & 1 deletion include/hpp/fcl/broadphase/detail/simple_interval.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
#ifndef HPP_FCL_BROADPHASE_DETAIL_SIMPLEINTERVAL_H
#define HPP_FCL_BROADPHASE_DETAIL_SIMPLEINTERVAL_H

#include "hpp/fcl/fwd.hh"
#include "hpp/fcl/data_types.h"
#include "hpp/fcl/fwd.hh"

namespace hpp {
namespace fcl {
Expand Down
4 changes: 2 additions & 2 deletions include/hpp/fcl/broadphase/detail/sparse_hash_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
#ifndef HPP_FCL_BROADPHASE_SPARSEHASHTABLE_H
#define HPP_FCL_BROADPHASE_SPARSEHASHTABLE_H

#include <set>
#include <vector>
#include <list>
#include <set>
#include <unordered_map>
#include <vector>

namespace hpp {
namespace fcl {
Expand Down
3 changes: 2 additions & 1 deletion include/hpp/fcl/broadphase/detail/spatial_hash-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@
#ifndef HPP_FCL_BROADPHASE_SPATIALHASH_INL_H
#define HPP_FCL_BROADPHASE_SPATIALHASH_INL_H

#include "hpp/fcl/broadphase/detail/spatial_hash.h"
#include <algorithm>

#include "hpp/fcl/broadphase/detail/spatial_hash.h"

namespace hpp {
namespace fcl {
namespace detail {
Expand Down
3 changes: 2 additions & 1 deletion include/hpp/fcl/broadphase/detail/spatial_hash.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@
#ifndef HPP_FCL_BROADPHASE_SPATIALHASH_H
#define HPP_FCL_BROADPHASE_SPATIALHASH_H

#include "hpp/fcl/BV/AABB.h"
#include <vector>

#include "hpp/fcl/BV/AABB.h"

namespace hpp {
namespace fcl {

Expand Down
4 changes: 2 additions & 2 deletions include/hpp/fcl/collision.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
#ifndef HPP_FCL_COLLISION_H
#define HPP_FCL_COLLISION_H

#include <hpp/fcl/data_types.h>
#include <hpp/fcl/collision_object.h>
#include <hpp/fcl/collision_data.h>
#include <hpp/fcl/collision_func_matrix.h>
#include <hpp/fcl/collision_object.h>
#include <hpp/fcl/data_types.h>
#include <hpp/fcl/timings.h>

namespace hpp {
Expand Down
Loading

0 comments on commit 388a97c

Please sign in to comment.