Explorar el Código

Fix v140 compile errror

xiaohunqupo hace 3 años
padre
commit
cc515746f7
Se han modificado 2 ficheros con 2 adiciones y 2 borrados
  1. 1 1
      code/AssetLib/Obj/ObjFileParser.cpp
  2. 1 1
      code/AssetLib/Obj/ObjFileParser.h

+ 1 - 1
code/AssetLib/Obj/ObjFileParser.cpp

@@ -55,7 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 namespace Assimp {
 namespace Assimp {
 
 
-constexpr char ObjFileParser::DEFAULT_MATERIAL[];
+constexpr const char ObjFileParser::DEFAULT_MATERIAL[];
 
 
 ObjFileParser::ObjFileParser() :
 ObjFileParser::ObjFileParser() :
         m_DataIt(),
         m_DataIt(),

+ 1 - 1
code/AssetLib/Obj/ObjFileParser.h

@@ -141,7 +141,7 @@ private:
     // because the class contains pointer to allocated memory
     // because the class contains pointer to allocated memory
 
 
     /// Default material name
     /// Default material name
-    static constexpr char DEFAULT_MATERIAL[] = AI_DEFAULT_MATERIAL_NAME;
+    static constexpr const char DEFAULT_MATERIAL[] = AI_DEFAULT_MATERIAL_NAME;
     //! Iterator to current position in buffer
     //! Iterator to current position in buffer
     DataArrayIt m_DataIt;
     DataArrayIt m_DataIt;
     //! Iterator to end position of buffer
     //! Iterator to end position of buffer