瀏覽代碼

closes https://github.com/assimp/assimp/issues/2398: fix the build.

Kim Kulling 6 年之前
父節點
當前提交
930af2da44
共有 2 個文件被更改,包括 6 次插入8 次删除
  1. 5 1
      code/C4DImporter.cpp
  2. 1 7
      code/C4DImporter.h

+ 5 - 1
code/C4DImporter.cpp

@@ -78,7 +78,11 @@ using namespace Assimp;
 using namespace Assimp::Formatter;
 
 namespace Assimp {
-    template<> const std::string LogFunctions<C4DImporter>::log_prefix = "C4D: ";
+    template<> const char* LogFunctions<C4DImporter>::Prefix()
+    {
+        static auto prefix = "C4D: ";
+        return prefix;
+    }
 }
 
 static const aiImporterDesc desc = {

+ 1 - 7
code/C4DImporter.h

@@ -78,14 +78,8 @@ namespace Assimp    {
 class C4DImporter : public BaseImporter, public LogFunctions<C4DImporter>
 {
 public:
-
     C4DImporter();
     ~C4DImporter();
-
-
-public:
-
-    // --------------------
     bool CanRead( const std::string& pFile, IOSystem* pIOHandler,
         bool checkSig) const;
 
@@ -119,5 +113,5 @@ private:
 }; // !class C4DImporter
 
 } // end of namespace Assimp
-#endif // INCLUDED_AI_CINEMA_4D_LOADER_H
 
+#endif // INCLUDED_AI_CINEMA_4D_LOADER_H