layers: Fix Windows build warnings

NOEXCEPT is defined multiple times

Change-Id: I9aef970e9588c17071cd71a31873db4090d50b07

diff --git a/layers/core_validation.h b/layers/core_validation.h
index 22ee28d..be75025 100644 (file)
--- a/layers/core_validation.h
+++ b/layers/core_validation.h
@@ -21,6 +21,7 @@
  * Author: Mark Lobodzinski <mark@lunarg.com>
  */
 
+#ifndef NOEXCEPT
 // Check for noexcept support
 #if defined(__clang__)
 #if __has_feature(cxx_noexcept)
@@ -41,6 +42,7 @@
 #else
 #define NOEXCEPT
 #endif
+#endif
 
 // Enable mem_tracker merged code
 #define MTMERGE 1

diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h
index 9e58c23..82183ff 100644 (file)
--- a/layers/core_validation_types.h
+++ b/layers/core_validation_types.h
@@ -23,6 +23,7 @@
 #ifndef CORE_VALIDATION_TYPES_H_
 #define CORE_VALIDATION_TYPES_H_
 
+#ifndef NOEXCEPT
 // Check for noexcept support
 #if defined(__clang__)
 #if __has_feature(cxx_noexcept)
@@ -43,6 +44,7 @@
 #else
 #define NOEXCEPT
 #endif
+#endif
 
 #include "vk_safe_struct.h"
 #include "vulkan/vulkan.h"

diff --git a/layers/descriptor_sets.h b/layers/descriptor_sets.h
index 3505516..4345154 100644 (file)
--- a/layers/descriptor_sets.h
+++ b/layers/descriptor_sets.h
@@ -21,6 +21,7 @@
 #define CORE_VALIDATION_DESCRIPTOR_SETS_H_
 
 // Check for noexcept support
+#ifndef NOEXCEPT
 #if defined(__clang__)
 #if __has_feature(cxx_noexcept)
 #define HAS_NOEXCEPT
@@ -40,6 +41,7 @@
 #else
 #define NOEXCEPT
 #endif
+#endif
 
 #include "core_validation_error_enums.h"
 #include "vk_validation_error_messages.h"