[Orxonox-commit 4726] r9395 - code/branches/shaders/src/libraries/core

davidsa at orxonox.net davidsa at orxonox.net
Mon Oct 15 15:12:14 CEST 2012


Author: davidsa
Date: 2012-10-15 15:12:13 +0200 (Mon, 15 Oct 2012)
New Revision: 9395

Modified:
   code/branches/shaders/src/libraries/core/Resource.cc
Log:
FIX: dynamic_cast from const to non-const is prohibited in newer versions of gcc, modified dynamic_cast so it will convert into a const, doesn't really change the program flow since we only use it to check against NULL

Modified: code/branches/shaders/src/libraries/core/Resource.cc
===================================================================
--- code/branches/shaders/src/libraries/core/Resource.cc	2012-10-12 11:07:59 UTC (rev 9394)
+++ code/branches/shaders/src/libraries/core/Resource.cc	2012-10-15 13:12:13 UTC (rev 9395)
@@ -100,7 +100,7 @@
                 ptr->basename = it->basename;
                 ptr->group = group;
                 ptr->size = it->uncompressedSize;
-                if (dynamic_cast<Ogre::FileSystemArchive*>(it->archive) != NULL)
+                if (dynamic_cast<const Ogre::FileSystemArchive*>(it->archive) != NULL)
                 {
                     boost::filesystem::path base(it->archive->getName());
                     base /= it->filename;




More information about the Orxonox-commit mailing list