prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

service/service: Make FunctionInfo's constructor constexpr

Browse Source 
Allows our service function arrays to be constexpr.
This commit is contained in:
Lioncash
2018-12-17 23:21:53 -05:00
parent 84823a3036
commit a9c3c042a7
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/service/service.h
View File

@@ -122,9 +122,6 @@ class ServiceFramework : public ServiceFrameworkBase {
protected: protected:
/// Contains information about a request type which is handled by the service. /// Contains information about a request type which is handled by the service.
struct FunctionInfo : FunctionInfoBase { struct FunctionInfo : FunctionInfoBase {
// TODO(yuriks): This function could be constexpr, but clang is the only compiler that
// doesn't emit an ICE or a wrong diagnostic because of the static_cast.
/** /**
* Constructs a FunctionInfo for a function. * Constructs a FunctionInfo for a function.
* *
@@ -134,7 +131,8 @@ protected:
* the request * the request
* @param name human-friendly name for the request. Used mostly for logging purposes. * @param name human-friendly name for the request. Used mostly for logging purposes.
*/ */
FunctionInfo(u32 expected_header, HandlerFnP<Self> handler_callback, const char* name) constexpr FunctionInfo(u32 expected_header, HandlerFnP<Self> handler_callback,
const char* name)
: FunctionInfoBase{ : FunctionInfoBase{
expected_header, expected_header,
// Type-erase member function pointer by casting it down to the base class. // Type-erase member function pointer by casting it down to the base class.