Просмотр исходного кода

Merge pull request #1003 from lioncash/var

video_core: Use variable template variants of type_traits interfaces where applicable
bunnei 8 лет назад
Родитель
Сommit
b8b9f41b6b
2 измененных файлов с 2 добавлено и 4 удалено
  1. 1 2
      src/video_core/command_processor.h
  2. 1 2
      src/video_core/engines/shader_bytecode.h

+ 1 - 2
src/video_core/command_processor.h

@@ -30,8 +30,7 @@ union CommandHeader {
 
     BitField<29, 3, SubmissionMode> mode;
 };
-static_assert(std::is_standard_layout<CommandHeader>::value == true,
-              "CommandHeader does not use standard layout");
+static_assert(std::is_standard_layout_v<CommandHeader>, "CommandHeader is not standard layout");
 static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!");
 
 } // namespace Tegra

+ 1 - 2
src/video_core/engines/shader_bytecode.h

@@ -477,8 +477,7 @@ union Instruction {
     u64 value;
 };
 static_assert(sizeof(Instruction) == 0x8, "Incorrect structure size");
-static_assert(std::is_standard_layout<Instruction>::value,
-              "Structure does not have standard layout");
+static_assert(std::is_standard_layout_v<Instruction>, "Instruction is not standard layout");
 
 class OpCode {
 public: