Browse Source

Merge pull request #2388 from lioncash/constexpr

kernel: Make handle type declarations constexpr
nce_cpp
bunnei 7 years ago
committed by GitHub
parent
commit
64bd271e7c
  1. 2
      src/core/hle/kernel/client_port.h
  2. 2
      src/core/hle/kernel/client_session.h
  3. 2
      src/core/hle/kernel/process.h
  4. 2
      src/core/hle/kernel/readable_event.h
  5. 2
      src/core/hle/kernel/resource_limit.h
  6. 2
      src/core/hle/kernel/server_port.h
  7. 2
      src/core/hle/kernel/server_session.h
  8. 2
      src/core/hle/kernel/shared_memory.h
  9. 2
      src/core/hle/kernel/thread.h
  10. 2
      src/core/hle/kernel/writable_event.h

2
src/core/hle/kernel/client_port.h

@ -25,7 +25,7 @@ public:
return name;
}
static const HandleType HANDLE_TYPE = HandleType::ClientPort;
static constexpr HandleType HANDLE_TYPE = HandleType::ClientPort;
HandleType GetHandleType() const override {
return HANDLE_TYPE;
}

2
src/core/hle/kernel/client_session.h

@ -29,7 +29,7 @@ public:
return name;
}
static const HandleType HANDLE_TYPE = HandleType::ClientSession;
static constexpr HandleType HANDLE_TYPE = HandleType::ClientSession;
HandleType GetHandleType() const override {
return HANDLE_TYPE;
}

2
src/core/hle/kernel/process.h

@ -85,7 +85,7 @@ public:
return name;
}
static const HandleType HANDLE_TYPE = HandleType::Process;
static constexpr HandleType HANDLE_TYPE = HandleType::Process;
HandleType GetHandleType() const override {
return HANDLE_TYPE;
}

2
src/core/hle/kernel/readable_event.h

@ -31,7 +31,7 @@ public:
return reset_type;
}
static const HandleType HANDLE_TYPE = HandleType::ReadableEvent;
static constexpr HandleType HANDLE_TYPE = HandleType::ReadableEvent;
HandleType GetHandleType() const override {
return HANDLE_TYPE;
}

2
src/core/hle/kernel/resource_limit.h

@ -41,7 +41,7 @@ public:
return GetTypeName();
}
static const HandleType HANDLE_TYPE = HandleType::ResourceLimit;
static constexpr HandleType HANDLE_TYPE = HandleType::ResourceLimit;
HandleType GetHandleType() const override {
return HANDLE_TYPE;
}

2
src/core/hle/kernel/server_port.h

@ -43,7 +43,7 @@ public:
return name;
}
static const HandleType HANDLE_TYPE = HandleType::ServerPort;
static constexpr HandleType HANDLE_TYPE = HandleType::ServerPort;
HandleType GetHandleType() const override {
return HANDLE_TYPE;
}

2
src/core/hle/kernel/server_session.h

@ -46,7 +46,7 @@ public:
return name;
}
static const HandleType HANDLE_TYPE = HandleType::ServerSession;
static constexpr HandleType HANDLE_TYPE = HandleType::ServerSession;
HandleType GetHandleType() const override {
return HANDLE_TYPE;
}

2
src/core/hle/kernel/shared_memory.h

@ -76,7 +76,7 @@ public:
return name;
}
static const HandleType HANDLE_TYPE = HandleType::SharedMemory;
static constexpr HandleType HANDLE_TYPE = HandleType::SharedMemory;
HandleType GetHandleType() const override {
return HANDLE_TYPE;
}

2
src/core/hle/kernel/thread.h

@ -106,7 +106,7 @@ public:
return "Thread";
}
static const HandleType HANDLE_TYPE = HandleType::Thread;
static constexpr HandleType HANDLE_TYPE = HandleType::Thread;
HandleType GetHandleType() const override {
return HANDLE_TYPE;
}

2
src/core/hle/kernel/writable_event.h

@ -37,7 +37,7 @@ public:
return name;
}
static const HandleType HANDLE_TYPE = HandleType::WritableEvent;
static constexpr HandleType HANDLE_TYPE = HandleType::WritableEvent;
HandleType GetHandleType() const override {
return HANDLE_TYPE;
}

Loading…
Cancel
Save