flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 21:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #624 Use auto function return type deduction.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-03-19 23:37:51 +00:00
parent 4700cb1602
commit eb4df2d893
8 changed files with 42 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/blackmisc/tuple.h
View File

@@ -75,21 +75,21 @@ namespace BlackMisc
friend class BlackMisc::Private::EncapsulationBreaker; \
static_assert(Private::HasEnabledTupleConversion<T>::value, \
"Missing BLACK_ENABLE_TUPLE_CONVERSION macro in " #T); \
static auto toTuple(const T &o) -> decltype(BlackMisc::tie MEMBERS) \
static auto toTuple(const T &o) \
{ \
return BlackMisc::tie MEMBERS; \
} \
static auto toTuple(T &o) -> decltype(BlackMisc::tie MEMBERS) \
static auto toTuple(T &o) \
{ \
return BlackMisc::tie MEMBERS; \
} \
static auto toMetaTuple(const T &o) -> decltype(BlackMisc::tieMeta MEMBERS) \
static auto toMetaTuple(const T &o) \
{ \
auto tu = BlackMisc::tieMeta MEMBERS; \
parser().extendMetaTuple(tu); \
return tu; \
} \
static auto toMetaTuple(T &o) -> decltype(BlackMisc::tieMeta MEMBERS) \
static auto toMetaTuple(T &o) \
{ \
auto tu = BlackMisc::tieMeta MEMBERS; \
parser().extendMetaTuple(tu); \
@@ -105,7 +105,7 @@ namespace BlackMisc
return parser().m_names; \
} \
public: \
static auto constToTuple(const T &o) -> decltype(BlackMisc::tie MEMBERS) \
static auto constToTuple(const T &o) \
{ \
return BlackMisc::tie MEMBERS; \
} \
@@ -127,21 +127,21 @@ namespace BlackMisc
friend class BlackMisc::Private::EncapsulationBreaker; \
static_assert(Private::HasEnabledTupleConversion<T<U...>>::value, \
"Missing BLACK_ENABLE_TUPLE_CONVERSION macro in " #T); \
static auto toTuple(const T<U...> &o) -> decltype(BlackMisc::tie MEMBERS) \
static auto toTuple(const T<U...> &o) \
{ \
return BlackMisc::tie MEMBERS; \
} \
static auto toTuple(T<U...> &o) -> decltype(BlackMisc::tie MEMBERS) \
static auto toTuple(T<U...> &o) \
{ \
return BlackMisc::tie MEMBERS; \
} \
static auto toMetaTuple(const T<U...> &o) -> decltype(BlackMisc::tieMeta MEMBERS) \
static auto toMetaTuple(const T<U...> &o) \
{ \
auto tu = BlackMisc::tieMeta MEMBERS; \
parser().extendMetaTuple(tu); \
return tu; \
} \
static auto toMetaTuple(T<U...> &o) -> decltype(BlackMisc::tieMeta MEMBERS) \
static auto toMetaTuple(T<U...> &o) \
{ \
auto tu = BlackMisc::tieMeta MEMBERS; \
parser().extendMetaTuple(tu); \
@@ -157,7 +157,7 @@ namespace BlackMisc
return parser().m_names; \
} \
public: \
static auto constToTuple(const T<U...> &o) -> decltype(BlackMisc::tie MEMBERS) \
static auto constToTuple(const T<U...> &o) \
{ \
return BlackMisc::tie MEMBERS; \
} \
@@ -286,7 +286,7 @@ namespace BlackMisc
* \ingroup Tuples
*/
template <class... Ts>
auto tie(Ts &&... args) -> decltype(std::make_tuple(Private::tieHelper(args)...))
auto tie(Ts &&... args)
{
return std::make_tuple(Private::tieHelper(args)...);
}
@@ -296,7 +296,7 @@ namespace BlackMisc
* \ingroup Tuples
*/
template <class... Ts>
auto tieMeta(Ts &&... args) -> decltype(std::make_tuple(Private::tieMetaHelper(args)...))
auto tieMeta(Ts &&... args)
{
return std::make_tuple(Private::tieMetaHelper(args)...);
}