diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-10-10 14:05:59 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-10-10 14:05:59 -0600 |
| commit | 9082f83791053509cf25c94584db97586fae635d (patch) | |
| tree | d59bcd1b7f89171096825ebce1d2d30a1d6eabd1 | |
| parent | 1f2c7e65f33fe0e3ac6537fc93ca89126aefac9a (diff) | |
| download | usermoji-9082f83791053509cf25c94584db97586fae635d.tar.xz | |
layers: Fix Windows build warnings
NOEXCEPT is defined multiple times
Change-Id: I9aef970e9588c17071cd71a31873db4090d50b07
| -rw-r--r-- | layers/core_validation.h | 2 | ||||
| -rw-r--r-- | layers/core_validation_types.h | 2 | ||||
| -rw-r--r-- | layers/descriptor_sets.h | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/layers/core_validation.h b/layers/core_validation.h index 22ee28dc..be750253 100644 --- 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 9e58c232..82183ffb 100644 --- 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 35055160..4345154e 100644 --- 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" |