0002-BlenderScene-use-explicit-namespace-instead-of-using.patch 2.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. From a099fe7cd331a839137115db5df1733c4c1c8070 Mon Sep 17 00:00:00 2001
  2. From: Peter Seiderer <ps.report@gmx.net>
  3. Date: Thu, 30 Dec 2021 18:01:54 +0100
  4. Subject: [PATCH] BlenderScene: use explicit namespace instead of using
  5. namespace
  6. Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320):
  7. .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
  8. const FileDatabase &db) const {
  9. ^
  10. In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
  11. from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
  12. .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
  13. void Convert(T &dest, const FileDatabase &db) const;
  14. ^
  15. .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
  16. const FileDatabase &db) const {
  17. ^
  18. In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
  19. from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
  20. .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
  21. void Convert(T &dest, const FileDatabase &db) const;
  22. ^
  23. [backport from upstream commit a099fe7cd331]
  24. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  25. ---
  26. code/AssetLib/Blender/BlenderScene.cpp | 7 +++++--
  27. 1 file changed, 5 insertions(+), 2 deletions(-)
  28. diff --git a/code/AssetLib/Blender/BlenderScene.cpp b/code/AssetLib/Blender/BlenderScene.cpp
  29. index c93d913fc..9ad086fe6 100644
  30. --- a/code/AssetLib/Blender/BlenderScene.cpp
  31. +++ b/code/AssetLib/Blender/BlenderScene.cpp
  32. @@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  33. #include "BlenderDNA.h"
  34. #include "BlenderSceneGen.h"
  35. -using namespace Assimp;
  36. -using namespace Assimp::Blender;
  37. +namespace Assimp {
  38. +namespace Blender {
  39. //--------------------------------------------------------------------------------
  40. template <>
  41. @@ -885,4 +885,7 @@ void DNA::RegisterConverters() {
  42. converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate<CollectionObject>, &Structure::Convert<CollectionObject>);
  43. }
  44. +} // namespace Blender
  45. +} //namespace Assimp
  46. +
  47. #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER
  48. --
  49. 2.34.1