Skip to content

Commit

Permalink
gna
Browse files Browse the repository at this point in the history
  • Loading branch information
christophe-lunarg committed Jan 18, 2024
1 parent 9d78651 commit 2aaba30
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
4 changes: 2 additions & 2 deletions glm/gtx/io.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wpadded"
# pragma clang diagnostic ignored "-Wshorten-64-to-32"
# pragma clang diagnostic ignored "-Wglobal-constructors"
#endif

#include <iosfwd> // std::basic_ostream<> (fwd)
Expand Down Expand Up @@ -202,9 +203,8 @@ namespace glm
/// @}
}//namespace glm

#include "io.inl"

#if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop
#endif

#include "io.inl"
12 changes: 12 additions & 0 deletions glm/gtx/io.inl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
#include "../gtc/matrix_access.hpp" // glm::col, glm::row
#include "../gtx/type_trait.hpp" // glm::type<>

#if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wpadded"
# pragma clang diagnostic ignored "-Wshorten-64-to-32"
# pragma clang diagnostic ignored "-Wglobal-constructors"
#endif

namespace glm{
namespace io
{
Expand Down Expand Up @@ -438,3 +445,8 @@ namespace detail
return detail::print_matrix_pair_on(os, a);
}
}//namespace glm

#if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop
#endif

0 comments on commit 2aaba30

Please sign in to comment.