Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use .hpp for headers #693

Merged
merged 19 commits into from
Apr 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
64e55a3
Merge remote-tracking branch 'origin/remove_virtual_when_override_use…
jslee02 Apr 24, 2016
ae49ca9
Merge remote-tracking branch 'origin/std_size_t' into js/h_to_hpp
jslee02 Apr 24, 2016
87beee6
Merge remote-tracking branch 'origin/treat_warnings_as_error' into js…
jslee02 Apr 24, 2016
c6f4b6a
Merge remote-tracking branch 'origin/grey/fix_ik/aspects' into js/h_t…
jslee02 Apr 24, 2016
929a5ea
Merge remote-tracking branch 'origin/js/return_shared_collision_detec…
jslee02 Apr 24, 2016
fc8c7c4
Merge remote-tracking branch 'origin/js/rename_apps_to_examples' into…
jslee02 Apr 24, 2016
0800968
Rename header extensions to .hpp
jslee02 Apr 24, 2016
be5b29b
More renaming extensions for namespace headers
jslee02 Apr 24, 2016
b5e9aed
Update CMakeLists.txt for the extension renaming
jslee02 Apr 24, 2016
a6a0615
Update header path for collision namespace
jslee02 Apr 24, 2016
4c6de40
Update header path for common namespace
jslee02 Apr 24, 2016
0d04c56
Update header path for math/integration namespace
jslee02 Apr 24, 2016
987ccc2
Update header path for dynamics/lcpsolver namespace
jslee02 Apr 24, 2016
5ae80c3
Update header path for the rest files
jslee02 Apr 24, 2016
08a7d45
Add underscore to header guards to make it different from macros
jslee02 Apr 24, 2016
46f3902
Update header guards for renaming to .hpp
jslee02 Apr 24, 2016
82f7556
Update planning namespace for renaming header extensions to .hpp
jslee02 Apr 24, 2016
46ab700
Merge remote-tracking branch 'origin/master' into js/h_to_hpp
jslee02 Apr 24, 2016
e0dab88
Merge remote-tracking branch 'origin/master' into js/h_to_hpp
jslee02 Apr 26, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ message(STATUS "[ Configured files ]")

# Generate the dart config file
# Ref: http://www.vtk.org/Wiki/CMake:How_To_Write_Platform_Checks
set(DART_CONFIG_IN ${CMAKE_SOURCE_DIR}/dart/config.h.in)
set(DART_CONFIG_OUT ${CMAKE_BINARY_DIR}/dart/config.h)
set(DART_CONFIG_IN ${CMAKE_SOURCE_DIR}/dart/config.hpp.in)
set(DART_CONFIG_OUT ${CMAKE_BINARY_DIR}/dart/config.hpp)
message(STATUS ${DART_CONFIG_OUT})
configure_file(${DART_CONFIG_IN} ${DART_CONFIG_OUT} @ONLY)
install(FILES ${DART_CONFIG_OUT} DESTINATION include/dart)
Expand Down
4 changes: 2 additions & 2 deletions dart/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ add_subdirectory(math)
add_subdirectory(simulation)

# Set header and source files
get_filename_component(dart_h "dart.h" ABSOLUTE)
get_filename_component(dart_h "dart.hpp" ABSOLUTE)
set(dart_hdrs
${dart_h}
${dart_common_hdrs}
Expand Down Expand Up @@ -62,7 +62,7 @@ if(MSVC)
)
endif()

install(FILES dart.h DESTINATION include/dart/ COMPONENT headers)
install(FILES dart.hpp DESTINATION include/dart/ COMPONENT headers)
install(TARGETS dart EXPORT DARTTargets DESTINATION lib)

# Coverage test files
Expand Down
16 changes: 8 additions & 8 deletions dart/collision/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Search all header and source files
file(GLOB hdrs "*.hpp")
file(GLOB srcs "*.cpp")
file(GLOB hdrs "*.h")
file(GLOB detail_hdrs "detail/*.hpp")
file(GLOB detail_srcs "detail/*.cpp")
file(GLOB detail_hdrs "detail/*.h")

# Add subdirectories
add_subdirectory(dart)
Expand All @@ -19,11 +19,11 @@ dart_get_filename_components(header_names "collision headers" ${hdrs})
set(
header_names
${header_names}
dart/dart.h
fcl/fcl.h
dart/dart.hpp
fcl/fcl.hpp
)
if(HAVE_BULLET_COLLISION)
set(header_names ${header_names} bullet/bullet.h)
set(header_names ${header_names} bullet/bullet.hpp)
endif()
dart_generate_include_header_list(
collision_headers
Expand All @@ -32,13 +32,13 @@ dart_generate_include_header_list(
${header_names}
)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/collision.h.in
${CMAKE_CURRENT_BINARY_DIR}/collision.h
${CMAKE_CURRENT_SOURCE_DIR}/collision.hpp.in
${CMAKE_CURRENT_BINARY_DIR}/collision.hpp
)

# Install
install(
FILES ${hdrs} ${CMAKE_CURRENT_BINARY_DIR}/collision.h
FILES ${hdrs} ${CMAKE_CURRENT_BINARY_DIR}/collision.hpp
DESTINATION include/dart/collision
COMPONENT headers
)
Expand Down
12 changes: 6 additions & 6 deletions dart/collision/CollisionDetector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "dart/collision/CollisionDetector.h"
#include "dart/collision/CollisionDetector.hpp"

#include <algorithm>

#include "dart/common/Console.h"
#include "dart/collision/CollisionObject.h"
#include "dart/collision/CollisionGroup.h"
#include "dart/dynamics/BodyNode.h"
#include "dart/dynamics/Skeleton.h"
#include "dart/common/Console.hpp"
#include "dart/collision/CollisionObject.hpp"
#include "dart/collision/CollisionGroup.hpp"
#include "dart/dynamics/BodyNode.hpp"
#include "dart/dynamics/Skeleton.hpp"

namespace dart {
namespace collision {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef DART_COLLISION_COLLISIONDETECTOR_H_
#define DART_COLLISION_COLLISIONDETECTOR_H_
#ifndef DART_COLLISION_COLLISIONDETECTOR_HPP_
#define DART_COLLISION_COLLISIONDETECTOR_HPP_

#include <vector>
#include <map>

#include <Eigen/Dense>

#include "dart/collision/Contact.h"
#include "dart/collision/Option.h"
#include "dart/collision/Result.h"
#include "dart/collision/SmartPointer.h"
#include "dart/dynamics/SmartPointer.h"
#include "dart/collision/Contact.hpp"
#include "dart/collision/Option.hpp"
#include "dart/collision/Result.hpp"
#include "dart/collision/SmartPointer.hpp"
#include "dart/dynamics/SmartPointer.hpp"

namespace dart {
namespace collision {
Expand Down Expand Up @@ -225,6 +225,6 @@ class CollisionDetector::ManagerForSharableCollisionObjects final :
} // namespace collision
} // namespace dart

#include "dart/collision/detail/CollisionDetector.h"
#include "dart/collision/detail/CollisionDetector.hpp"

#endif // DART_COLLISION_COLLISIONDETECTOR_H_
#endif // DART_COLLISION_COLLISIONDETECTOR_HPP_
6 changes: 3 additions & 3 deletions dart/collision/CollisionFilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "dart/collision/CollisionFilter.h"
#include "dart/collision/CollisionFilter.hpp"

#include "dart/dynamics/BodyNode.h"
#include "dart/collision/CollisionObject.h"
#include "dart/dynamics/BodyNode.hpp"
#include "dart/collision/CollisionObject.hpp"

namespace dart {
namespace collision {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef DART_COLLISION_COLLISIONFILTER_H_
#define DART_COLLISION_COLLISIONFILTER_H_
#ifndef DART_COLLISION_COLLISIONFILTER_HPP_
#define DART_COLLISION_COLLISIONFILTER_HPP_

namespace dart {

Expand Down Expand Up @@ -65,4 +65,4 @@ struct BodyNodeCollisionFilter : CollisionFilter
} // namespace collision
} // namespace dart

#endif // DART_COLLISION_COLLISIONFILTER_H_
#endif // DART_COLLISION_COLLISIONFILTER_HPP_
10 changes: 5 additions & 5 deletions dart/collision/CollisionGroup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "dart/collision/CollisionGroup.h"
#include "dart/collision/CollisionGroup.hpp"

#include <cassert>

#include "dart/collision/CollisionObject.h"
#include "dart/collision/CollisionDetector.h"
#include "dart/dynamics/BodyNode.h"
#include "dart/dynamics/Skeleton.h"
#include "dart/collision/CollisionObject.hpp"
#include "dart/collision/CollisionDetector.hpp"
#include "dart/dynamics/BodyNode.hpp"
#include "dart/dynamics/Skeleton.hpp"

namespace dart {
namespace collision {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef DART_COLLISION_COLLISIONGROUP_H_
#define DART_COLLISION_COLLISIONGROUP_H_
#ifndef DART_COLLISION_COLLISIONGROUP_HPP_
#define DART_COLLISION_COLLISIONGROUP_HPP_

#include <map>
#include <vector>
#include "dart/collision/SmartPointer.h"
#include "dart/collision/Option.h"
#include "dart/collision/Result.h"
#include "dart/dynamics/SmartPointer.h"
#include "dart/collision/SmartPointer.hpp"
#include "dart/collision/Option.hpp"
#include "dart/collision/Result.hpp"
#include "dart/dynamics/SmartPointer.hpp"

namespace dart {
namespace collision {
Expand Down Expand Up @@ -236,6 +236,6 @@ class CollisionGroup
} // namespace collision
} // namespace dart

#include "dart/collision/detail/CollisionGroup.h"
#include "dart/collision/detail/CollisionGroup.hpp"

#endif // DART_COLLISION_COLLISIONGROUP_H_
#endif // DART_COLLISION_COLLISIONGROUP_HPP_
6 changes: 3 additions & 3 deletions dart/collision/CollisionObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "dart/collision/CollisionObject.h"
#include "dart/collision/CollisionObject.hpp"

#include "dart/collision/CollisionDetector.h"
#include "dart/dynamics/ShapeFrame.h"
#include "dart/collision/CollisionDetector.hpp"
#include "dart/dynamics/ShapeFrame.hpp"

namespace dart {
namespace collision {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef DART_COLLISION_COLLISIONOBJECT_H_
#define DART_COLLISION_COLLISIONOBJECT_H_
#ifndef DART_COLLISION_COLLISIONOBJECT_HPP_
#define DART_COLLISION_COLLISIONOBJECT_HPP_

#include <Eigen/Dense>

#include "dart/collision/SmartPointer.h"
#include "dart/dynamics/SmartPointer.h"
#include "dart/collision/SmartPointer.hpp"
#include "dart/dynamics/SmartPointer.hpp"

namespace dart {
namespace collision {
Expand Down Expand Up @@ -93,4 +93,4 @@ class CollisionObject
} // namespace collision
} // namespace dart

#endif // DART_COLLISION_COLLISIONOBJECT_H_
#endif // DART_COLLISION_COLLISIONOBJECT_HPP_
2 changes: 1 addition & 1 deletion dart/collision/Contact.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "dart/collision/Contact.h"
#include "dart/collision/Contact.hpp"

namespace dart {
namespace collision {
Expand Down
10 changes: 5 additions & 5 deletions dart/collision/Contact.h → dart/collision/Contact.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef DART_COLLISION_CONTACT_H_
#define DART_COLLISION_CONTACT_H_
#ifndef DART_COLLISION_CONTACT_HPP_
#define DART_COLLISION_CONTACT_HPP_

#include <Eigen/Dense>
#include "dart/collision/SmartPointer.h"
#include "dart/dynamics/SmartPointer.h"
#include "dart/collision/SmartPointer.hpp"
#include "dart/dynamics/SmartPointer.hpp"

namespace dart {
namespace collision {
Expand Down Expand Up @@ -87,4 +87,4 @@ struct Contact
} // namespace collision
} // namespace dart

#endif // DART_COLLISION_CONTACT_H_
#endif // DART_COLLISION_CONTACT_HPP_
2 changes: 1 addition & 1 deletion dart/collision/Option.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "dart/collision/Option.h"
#include "dart/collision/Option.hpp"

namespace dart {
namespace collision {
Expand Down
6 changes: 3 additions & 3 deletions dart/collision/Option.h → dart/collision/Option.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef DART_COLLISION_OPTION_H_
#define DART_COLLISION_OPTION_H_
#ifndef DART_COLLISION_OPTION_HPP_
#define DART_COLLISION_OPTION_HPP_

#include <cstddef>
#include <memory>
Expand Down Expand Up @@ -72,4 +72,4 @@ struct CollisionOption
} // namespace collision
} // namespace dart

#endif // DART_COLLISION_OPTION_H_
#endif // DART_COLLISION_OPTION_HPP_
10 changes: 5 additions & 5 deletions dart/collision/Result.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "dart/collision/Result.h"
#include "dart/collision/CollisionObject.h"
#include "dart/collision/Result.hpp"
#include "dart/collision/CollisionObject.hpp"

#include "dart/dynamics/ShapeFrame.h"
#include "dart/dynamics/ShapeNode.h"
#include "dart/dynamics/BodyNode.h"
#include "dart/dynamics/ShapeFrame.hpp"
#include "dart/dynamics/ShapeNode.hpp"
#include "dart/dynamics/BodyNode.hpp"

namespace dart {
namespace collision {
Expand Down
8 changes: 4 additions & 4 deletions dart/collision/Result.h → dart/collision/Result.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef DART_COLLISION_RESULT_H_
#define DART_COLLISION_RESULT_H_
#ifndef DART_COLLISION_RESULT_HPP_
#define DART_COLLISION_RESULT_HPP_

#include <vector>
#include <unordered_set>
#include "dart/collision/Contact.h"
#include "dart/collision/Contact.hpp"

namespace dart {

Expand Down Expand Up @@ -112,4 +112,4 @@ class CollisionResult
} // namespace collision
} // namespace dart

#endif // DART_COLLISION_RESULT_H_
#endif // DART_COLLISION_RESULT_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef DART_COLLISION_SMARTPOINTER_H_
#define DART_COLLISION_SMARTPOINTER_H_
#ifndef DART_COLLISION_SMARTPOINTER_HPP_
#define DART_COLLISION_SMARTPOINTER_HPP_

#include "dart/config.h"
#include "dart/common/SmartPointer.h"
#include "dart/config.hpp"
#include "dart/common/SmartPointer.hpp"

namespace dart {
namespace collision {
Expand All @@ -57,4 +57,4 @@ DART_COMMON_MAKE_SHARED_WEAK(CollisionGroup)
} // namespace collision
} // namespace dart

#endif // DART_COLLISION_SMARTPOINTER_H_
#endif // DART_COLLISION_SMARTPOINTER_HPP_
Loading