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.

Sign up for GitHub

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

Port clang warning fix over to 6.4 #964

Merged
merged 2 commits into from
Feb 1, 2018
Merged

Port clang warning fix over to 6.4 #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1f5a92
Port clang warning fix over to 6.4
mxgrey Jan 31, 2018
e65f57e
Update changelog for #964 (#966)
jslee02 Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@

* Misc

* Add World::create(): [#962](https://github.com/dartsim/dart/pull/962)
* Suppressed warnings: [#937](https://github.com/dartsim/dart/pull/937)
* Added World::create(): [#962](https://github.com/dartsim/dart/pull/962)
* Suppressed -Winjected-class-name warnings from Clang 5.0.0: [#964](https://github.com/dartsim/dart/pull/964)
* Suppressed -Wdangling-else warnings from GCC 7.2.0: [#937](https://github.com/dartsim/dart/pull/937)
* Fixed various build issues with Visual Studio: [#956](https://github.com/dartsim/dart/pull/956)

### [DART 6.3.0 (2017-10-04)](https://github.com/dartsim/dart/milestone/36?closed=1)
Expand Down
31 changes: 28 additions & 3 deletions dart/common/detail/CompositeData.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,38 @@ namespace dart {
namespace common {
namespace detail {

//==============================================================================
// This default template definition will be called when AspectOrComposite is
// an Aspect.
template <class AspectOrComposite, bool isAspect>
struct GetAspectImpl
{
using Type = AspectOrComposite;
};

//==============================================================================
// This template specialization will be called when AspectOrComposite is not
// an Aspect (and is presumably a composite that defines a nested Aspect type).
template <class AspectOrComposite>
struct GetAspectImpl<AspectOrComposite, false>
{
// If you get a compiler error that leads you here, then you are trying to
// ask for the Aspect of an object that is not associated with any Aspect.
// That means it does not define a nested Aspect type (such as how
// RevoluteJoint defines the RevoluteJoint::Aspect).
//
// Whatever function is leading to the error must be given a template type
// that either defines a nested type with the name Aspect, or else inherits
// from the type dart::common::Aspect.
using Type = typename AspectOrComposite::Aspect;
};

//==============================================================================
template <class AspectT>
struct GetAspect
{
using Type = typename std::conditional<
std::is_base_of<Aspect, AspectT>::value,
AspectT, typename AspectT::Aspect>::type;
using Type = typename GetAspectImpl<
AspectT, std::is_base_of<Aspect, AspectT>::value>::Type;
};

//==============================================================================
Expand Down