Skip to content

Fix module warning suppression order for Windows clang/clang-cl #2612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sharadhr wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −28
Open

Fix module warning suppression order for Windows clang/clang-cl #2612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions generator/snippets/CppmTemplate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ export import std;

VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == ${headerVersion}, "Wrong VK_HEADER_VERSION!" );

#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 5244)
#elif defined(__clang__)
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
#elif defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 5244)
#elif defined(__GNUC__)
#endif

Expand All @@ -43,10 +43,10 @@ VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == ${headerVersion}, "Wrong VK_HEADE
#include <vulkan/${api}_raii.hpp>
#include <vulkan/${api}_shared.hpp>

#if defined(_MSC_VER)
# pragma warning(pop)
#elif defined(__clang__)
#if defined(__clang__)
# pragma clang diagnostic pop
#elif defined(_MSC_VER)
# pragma warning(pop)
#elif defined(__GNUC__)
#endif

Expand Down
14 changes: 7 additions & 7 deletions generator/snippets/VideoCppmTemplate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ export module vulkan_video;

import vulkan;

#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 5244)
#elif defined(__clang__)
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
#elif defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 5244)
#elif defined(__GNUC__)
#endif

#include <vulkan/vulkan_video.hpp>

#if defined(_MSC_VER)
# pragma warning(pop)
#elif defined(__clang__)
#if defined(__clang__)
# pragma clang diagnostic pop
#elif defined(_MSC_VER)
# pragma warning(pop)
#elif defined(__GNUC__)
#endif
14 changes: 7 additions & 7 deletions vulkan/vulkan.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ export import std;

VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == 352, "Wrong VK_HEADER_VERSION!" );

#if defined( _MSC_VER )
# pragma warning( push )
# pragma warning( disable : 5244 )
#elif defined( __clang__ )
#if defined( __clang__ )
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
#elif defined( _MSC_VER )
# pragma warning( push )
# pragma warning( disable : 5244 )
#elif defined( __GNUC__ )
#endif

Expand All @@ -45,10 +45,10 @@ VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == 352, "Wrong VK_HEADER_VERSION!" )
#include <vulkan/vulkan_raii.hpp>
#include <vulkan/vulkan_shared.hpp>

#if defined( _MSC_VER )
# pragma warning( pop )
#elif defined( __clang__ )
#if defined( __clang__ )
# pragma clang diagnostic pop
#elif defined( _MSC_VER )
# pragma warning( pop )
#elif defined( __GNUC__ )
#endif

Expand Down
14 changes: 7 additions & 7 deletions vulkan/vulkan_video.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ export module vulkan_video;

import vulkan;

#if defined( _MSC_VER )
# pragma warning( push )
# pragma warning( disable : 5244 )
#elif defined( __clang__ )
#if defined( __clang__ )
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
#elif defined( _MSC_VER )
# pragma warning( push )
# pragma warning( disable : 5244 )
#elif defined( __GNUC__ )
#endif

#include <vulkan/vulkan_video.hpp>

#if defined( _MSC_VER )
# pragma warning( pop )
#elif defined( __clang__ )
#if defined( __clang__ )
# pragma clang diagnostic pop
#elif defined( _MSC_VER )
# pragma warning( pop )
#elif defined( __GNUC__ )
#endif
Loading