diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:11 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:11 +0200 |
| commit | c3c7e6ebc29cce466d954f72f340a257d76b5ec2 (patch) | |
| tree | dc72395a1792572e9ddea04b1cfe2d8ce5503c78 /src/3rdparty/assimp/include/assimp/Compiler/poppack1.h | |
| parent | fa7cb071928c9603bb0c5a0f1958dd4a7c045340 (diff) | |
| parent | a96a379a6aeac867413330026a78ff71c19d34dc (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl
Change-Id: I503a36099765acfde0a14df04c8215b055121fa5
Diffstat (limited to 'src/3rdparty/assimp/include/assimp/Compiler/poppack1.h')
| -rw-r--r-- | src/3rdparty/assimp/include/assimp/Compiler/poppack1.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/3rdparty/assimp/include/assimp/Compiler/poppack1.h b/src/3rdparty/assimp/include/assimp/Compiler/poppack1.h deleted file mode 100644 index e033bc147..000000000 --- a/src/3rdparty/assimp/include/assimp/Compiler/poppack1.h +++ /dev/null @@ -1,22 +0,0 @@ - -// =============================================================================== -// May be included multiple times - resets structure packing to the defaults -// for all supported compilers. Reverts the changes made by #include <pushpack1.h> -// -// Currently this works on the following compilers: -// MSVC 7,8,9 -// GCC -// BORLAND (complains about 'pack state changed but not reverted', but works) -// =============================================================================== - -#ifndef AI_PUSHPACK_IS_DEFINED -# error pushpack1.h must be included after poppack1.h -#endif - -// reset packing to the original value -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__) -# pragma pack( pop ) -#endif -#undef PACK_STRUCT - -#undef AI_PUSHPACK_IS_DEFINED |