wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1247338 - really make Atomic's constructor constexpr; r=Waldo

Browse Source 
Atomic's constructor is marked as constexpr, but it calls a
non-constexpr function, ToStorageTypeArgument::convert.  For compilers
which require constexpr-ness on constructors to inline away the actual
constructor call, the call to ToStorageTypeArgument::convert completely
disables the constexpr-ness of the constructor.  Let's fix this by
marking all relevant instances of ToStorageTypeArgument::convert as
MOZ_CONSTEXPR, thus satisfying the compiler once again.
This commit is contained in:
Nathan Froyd 2016-02-10 11:28:36 -05:00
parent 2fe8022dbb
commit 57c59afe5a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mfbt/Atomics.h
View File

@ -323,7 +323,7 @@ struct AtomicIntrinsics<T*, Order>
template<typename T>
struct ToStorageTypeArgument
{
static T convert (T aT) { return aT; }
static MOZ_CONSTEXPR T convert (T aT) { return aT; }
};
} // namespace detail
@ -514,13 +514,13 @@ struct ToStorageTypeArgument
{
typedef typename AtomicStorageType<T>::Type ResultType;
static ResultType convert (T aT) { return ResultType(aT); }
static MOZ_CONSTEXPR ResultType convert (T aT) { return ResultType(aT); }
};
template<typename T>
struct ToStorageTypeArgument<T, false>
{
static T convert (T aT) { return aT; }
static MOZ_CONSTEXPR T convert (T aT) { return aT; }
};
} // namespace detail