mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Potential GCC compile fix

Browse Source
This commit is contained in:
Alexander Bock
2016-09-21 23:17:50 +02:00
parent a400999c4b
commit 6c50d4968c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/openspace/documentation/verifier.h
View File

@@ -308,7 +308,7 @@ struct LessVerifier : public OperatorVerifier<T, std::less<typename T::Type>> {
"T cannot be VectorVerifier"
);
using OperatorVerifier::OperatorVerifier;
using OperatorVerifier<T, std::less<typename T::Type>>::OperatorVerifier;
std::string documentation() const;
};
@@ -337,7 +337,7 @@ struct LessEqualVerifier : public OperatorVerifier<T, std::less_equal<typename T
"T cannot be VectorVerifier"
);
using OperatorVerifier::OperatorVerifier;
using OperatorVerifier<T, std::less_equal<typename T::Type>>::OperatorVerifier;
std::string documentation() const override;
};
@@ -366,7 +366,7 @@ struct GreaterVerifier : public OperatorVerifier<T, std::greater<typename T::Typ
"T cannot be VectorVerifier"
);
using OperatorVerifier::OperatorVerifier;
using OperatorVerifier<T, std::greater<typename T::Type>>::OperatorVerifier;
std::string documentation() const override;
};
@@ -395,7 +395,7 @@ struct GreaterEqualVerifier : public OperatorVerifier<T, std::greater_equal<type
"T cannot be VectorVerifier"
);
using OperatorVerifier::OperatorVerifier;
using OperatorVerifier<T, std::greater_equal<typename T::Type>>::OperatorVerifier;
std::string documentation() const override;
};
@@ -408,7 +408,7 @@ template <typename T>
struct EqualVerifier : public OperatorVerifier<T, std::equal_to<typename T::Type>> {
static_assert(!std::is_base_of<TableVerifier, T>::value, "T cannot be TableVerifier");
using OperatorVerifier::OperatorVerifier;
using OperatorVerifier<T, std::equal_to<typename T::Type>>::OperatorVerifier;
std::string documentation() const override;
};
@@ -422,7 +422,7 @@ template <typename T>
struct UnequalVerifier : public OperatorVerifier<T, std::not_equal_to<typename T::Type>> {
static_assert(!std::is_base_of<TableVerifier, T>::value, "T cannot be TableVerifier");
using OperatorVerifier::OperatorVerifier;
using OperatorVerifier<T, std::not_equal_to<typename T::Type>>::OperatorVerifier;
std::string documentation() const override;
};

2
include/openspace/documentation/verifier.inl
View File

@@ -85,7 +85,7 @@ TestResult OperatorVerifier<T, Operator>::operator()(const ghoul::Dictionary& di
{
TestResult res = T::operator()(dict, key);
if (res.success) {
if (Operator()(dict.value<Type>(key), value)) {
if (Operator()(dict.value<typename T::Type>(key), value)) {
return { true, {} };
}
else {