diff --git a/0001-use-fully-qualified-namespace-in-byteswap-macros.patch b/0001-use-fully-qualified-namespace-in-byteswap-macros.patch new file mode 100644 index 0000000..da843be --- /dev/null +++ b/0001-use-fully-qualified-namespace-in-byteswap-macros.patch @@ -0,0 +1,70 @@ +From ed6b6cd65c5a707842366e08eb7804828359b090 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= + +Date: Mon, 31 Jan 2022 14:41:41 +0100 +Subject: [PATCH] use fully qualified namespace in byteswap macros + +Closes: https://github.com/assimp/assimp/issues/4358 +--- + include/assimp/ByteSwapper.h | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/include/assimp/ByteSwapper.h b/include/assimp/ByteSwapper.h +index cf3a703b0..488f7a51d 100644 +--- a/include/assimp/ByteSwapper.h ++++ b/include/assimp/ByteSwapper.h +@@ -211,7 +211,7 @@ template struct ByteSwap::_swapper { + // -------------------------------------------------------------------------------------- + #if (defined AI_BUILD_BIG_ENDIAN) + # define AI_LE(t) (t) +-# define AI_BE(t) ByteSwap::Swapped(t) ++# define AI_BE(t) Assimp::ByteSwap::Swapped(t) + # define AI_LSWAP2(p) + # define AI_LSWAP4(p) + # define AI_LSWAP8(p) +@@ -219,16 +219,16 @@ template struct ByteSwap::_swapper { + # define AI_LSWAP4P(p) + # define AI_LSWAP8P(p) + # define LE_NCONST const +-# define AI_SWAP2(p) ByteSwap::Swap2(&(p)) +-# define AI_SWAP4(p) ByteSwap::Swap4(&(p)) +-# define AI_SWAP8(p) ByteSwap::Swap8(&(p)) +-# define AI_SWAP2P(p) ByteSwap::Swap2((p)) +-# define AI_SWAP4P(p) ByteSwap::Swap4((p)) +-# define AI_SWAP8P(p) ByteSwap::Swap8((p)) ++# define AI_SWAP2(p) Assimp::ByteSwap::Swap2(&(p)) ++# define AI_SWAP4(p) Assimp::ByteSwap::Swap4(&(p)) ++# define AI_SWAP8(p) Assimp::ByteSwap::Swap8(&(p)) ++# define AI_SWAP2P(p) Assimp::ByteSwap::Swap2((p)) ++# define AI_SWAP4P(p) Assimp::ByteSwap::Swap4((p)) ++# define AI_SWAP8P(p) Assimp::ByteSwap::Swap8((p)) + # define BE_NCONST + #else + # define AI_BE(t) (t) +-# define AI_LE(t) ByteSwap::Swapped(t) ++# define AI_LE(t) Assimp::ByteSwap::Swapped(t) + # define AI_SWAP2(p) + # define AI_SWAP4(p) + # define AI_SWAP8(p) +@@ -236,12 +236,12 @@ template struct ByteSwap::_swapper { + # define AI_SWAP4P(p) + # define AI_SWAP8P(p) + # define BE_NCONST const +-# define AI_LSWAP2(p) ByteSwap::Swap2(&(p)) +-# define AI_LSWAP4(p) ByteSwap::Swap4(&(p)) +-# define AI_LSWAP8(p) ByteSwap::Swap8(&(p)) +-# define AI_LSWAP2P(p) ByteSwap::Swap2((p)) +-# define AI_LSWAP4P(p) ByteSwap::Swap4((p)) +-# define AI_LSWAP8P(p) ByteSwap::Swap8((p)) ++# define AI_LSWAP2(p) Assimp::ByteSwap::Swap2(&(p)) ++# define AI_LSWAP4(p) Assimp::ByteSwap::Swap4(&(p)) ++# define AI_LSWAP8(p) Assimp::ByteSwap::Swap8(&(p)) ++# define AI_LSWAP2P(p) Assimp::ByteSwap::Swap2((p)) ++# define AI_LSWAP4P(p) Assimp::ByteSwap::Swap4((p)) ++# define AI_LSWAP8P(p) Assimp::ByteSwap::Swap8((p)) + # define LE_NCONST + #endif + +-- +2.34.1 +