Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
278d7fce
Commit
278d7fce
authored
4 years ago
by
Timo Koch
Browse files
Options
Downloads
Patches
Plain Diff
[propertysytem] Remove outdated macro-related check
parent
5f2edbd2
No related branches found
No related tags found
1 merge request
!2512
[propertysystem] Some cleanup
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/common/properties/propertysystem.hh
+3
-4
3 additions, 4 deletions
dumux/common/properties/propertysystem.hh
with
3 additions
and
4 deletions
dumux/common/properties/propertysystem.hh
+
3
−
4
View file @
278d7fce
...
...
@@ -50,16 +50,15 @@ template<class P>
constexpr
std
::
true_type
isDefinedProperty
(...)
{
return
{};
}
//! check if a TypeTag inherits from other TypeTags
//! the enable_if portion of decltype is only needed for the macro hack to work, if no macros are in use anymore it can be removed,
//! i.e. then trailing return type is then -> decltype(std::declval<typename T::InheritsFrom>(), std::true_type{})
template
<
class
T
>
constexpr
auto
hasParentTypeTag
(
int
)
->
decltype
(
std
::
declval
<
typename
T
::
InheritsFrom
>
(),
std
::
enable_if_t
<!
std
::
is_same
<
typename
T
::
InheritsFrom
,
void
>::
value
,
int
>
{},
std
::
true_type
{})
->
decltype
(
std
::
declval
<
typename
T
::
InheritsFrom
>
(),
std
::
true_type
{})
{
return
{};
}
//! fall back if a TypeTag doesn't inherit
template
<
class
T
>
constexpr
std
::
false_type
hasParentTypeTag
(...)
{
return
{};
}
constexpr
std
::
false_type
hasParentTypeTag
(...)
{
return
{};
}
//! helper alias to concatenate multiple tuples
template
<
class
...
Tuples
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment