diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-30 16:00:24 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-31 11:55:27 +0100 |
| commit | 963cbbaa420b12e810d23820b78f73c3eaaa15a8 (patch) | |
| tree | b9f9fd1284560b5dfaf9b3cf650c775fa1c8083a /src/3rdparty | |
| parent | 3019b82b1b9813b7d23ebc74a40e437cecd60a60 (diff) | |
Replace old Q_DECL statements with modern C++
Since we depend on C++17 now, all of these can go.
Change-Id: I0484fd4bb99e4367ec211c29146c316453729959
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/assembler/ARM64Assembler.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/3rdparty/masm/assembler/ARM64Assembler.h b/src/3rdparty/masm/assembler/ARM64Assembler.h index ca6b33d39a..a856196fe6 100644 --- a/src/3rdparty/masm/assembler/ARM64Assembler.h +++ b/src/3rdparty/masm/assembler/ARM64Assembler.h @@ -525,8 +525,8 @@ typedef enum { #undef DECLARE_REGISTER } FPRegisterID; -static Q_DECL_CONSTEXPR bool isSp(RegisterID reg) { return reg == sp; } -static Q_DECL_CONSTEXPR bool isZr(RegisterID reg) { return reg == zr; } +static constexpr bool isSp(RegisterID reg) { return reg == sp; } +static constexpr bool isZr(RegisterID reg) { return reg == zr; } } // namespace ARM64Registers @@ -535,15 +535,15 @@ public: typedef ARM64Registers::RegisterID RegisterID; typedef ARM64Registers::FPRegisterID FPRegisterID; - static Q_DECL_CONSTEXPR RegisterID firstRegister() { return ARM64Registers::x0; } - static Q_DECL_CONSTEXPR RegisterID lastRegister() { return ARM64Registers::sp; } + static constexpr RegisterID firstRegister() { return ARM64Registers::x0; } + static constexpr RegisterID lastRegister() { return ARM64Registers::sp; } - static Q_DECL_CONSTEXPR FPRegisterID firstFPRegister() { return ARM64Registers::q0; } - static Q_DECL_CONSTEXPR FPRegisterID lastFPRegister() { return ARM64Registers::q31; } + static constexpr FPRegisterID firstFPRegister() { return ARM64Registers::q0; } + static constexpr FPRegisterID lastFPRegister() { return ARM64Registers::q31; } private: - static Q_DECL_CONSTEXPR bool isSp(RegisterID reg) { return ARM64Registers::isSp(reg); } - static Q_DECL_CONSTEXPR bool isZr(RegisterID reg) { return ARM64Registers::isZr(reg); } + static constexpr bool isSp(RegisterID reg) { return ARM64Registers::isSp(reg); } + static constexpr bool isZr(RegisterID reg) { return ARM64Registers::isZr(reg); } public: ARM64Assembler() |