diff --git a/code/BaseImporter.cpp b/code/BaseImporter.cpp index 1c4f4bbcc..3c6bdb5ce 100644 --- a/code/BaseImporter.cpp +++ b/code/BaseImporter.cpp @@ -525,7 +525,7 @@ void BatchLoader::LoadAll() DefaultLogger::get()->info("File: " + (*it).file); } data->pImporter->ReadFile((*it).file,pp); - (*it).scene = const_cast(data->pImporter->GetOrphanedScene()); + (*it).scene = data->pImporter->GetOrphanedScene(); (*it).loaded = true; DefaultLogger::get()->info("%%% END EXTERNAL FILE %%%"); diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp index b94876b62..a5110df46 100644 --- a/code/ColladaLoader.cpp +++ b/code/ColladaLoader.cpp @@ -230,13 +230,13 @@ void ColladaLoader::ResolveNodeInstances( const ColladaParser& pParser, const Co { // find the corresponding node in the library const ColladaParser::NodeLibrary::const_iterator itt = pParser.mNodeLibrary.find((*it).mNode); - Collada::Node* nd = itt == pParser.mNodeLibrary.end() ? NULL : (*itt).second; + const Collada::Node* nd = itt == pParser.mNodeLibrary.end() ? NULL : (*itt).second; // FIX for http://sourceforge.net/tracker/?func=detail&aid=3054873&group_id=226462&atid=1067632 // need to check for both name and ID to catch all. To avoid breaking valid files, // the workaround is only enabled when the first attempt to resolve the node has failed. if (!nd) { - nd = const_cast(FindNode(pParser.mRootNode,(*it).mNode)); + nd = FindNode(pParser.mRootNode,(*it).mNode); } if (!nd) DefaultLogger::get()->error("Collada: Unable to resolve reference to instanced node " + (*it).mNode); diff --git a/code/IFCLoader.cpp b/code/IFCLoader.cpp index a37aaed9b..836c852d8 100644 --- a/code/IFCLoader.cpp +++ b/code/IFCLoader.cpp @@ -155,7 +155,7 @@ void IFCImporter::InternReadFile( const std::string& pFile, } boost::scoped_ptr db(STEP::ReadFileHeader(stream)); - const STEP::HeaderInfo& head = const_cast(*db).GetHeader(); + const STEP::HeaderInfo& head = static_cast(*db).GetHeader(); if(!head.fileSchema.size() || head.fileSchema.substr(0,3) != "IFC") { ThrowException("Unrecognized file schema: " + head.fileSchema); diff --git a/code/MDLMaterialLoader.cpp b/code/MDLMaterialLoader.cpp index f7748fef5..1946eedd9 100644 --- a/code/MDLMaterialLoader.cpp +++ b/code/MDLMaterialLoader.cpp @@ -63,9 +63,9 @@ void MDLImporter::SearchPalette(const unsigned char** pszColorMap) { if (pcStream->FileSize() >= 768) { - szColorMap = new unsigned char[256*3]; - pcStream->Read(const_cast(szColorMap),256*3,1); - + unsigned char* colorMap = new unsigned char[256*3]; + szColorMap = colorMap; + pcStream->Read(colorMap,256*3,1); DefaultLogger::get()->info("Found valid colormap.lmp in directory. " "It will be used to decode embedded textures in palletized formats."); }