mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 03:40:49 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Issue #178 - workaround for compilation problems with ogre 1.8.0."

Browse Source 
This reverts commit 37e272b3b5e18d1a93a1d69804a96845f8762ba1.

It shouldn't be commited and pushed to config branch.
This commit is contained in:
Lukasz Gromanowski 2012-01-26 00:14:03 +01:00
parent 1d96b99532
commit f4b6caac59
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/bsa/bsa_archive.cpp
View File

@ -221,12 +221,6 @@ class BSAArchive : public Archive
{ {
BSAFile arc; BSAFile arc;
FileInfoListPtr findFileInfo(const String&, bool, bool) const
{
static FileInfoListPtr filp(new FileInfoList());
return filp;
}
public: public:
BSAArchive(const String& name) BSAArchive(const String& name)
: Archive(name, "BSA") : Archive(name, "BSA")

8
extern/caelum/src/CaelumPlugin.cpp vendored
View File

@ -21,17 +21,17 @@ along with Caelum. If not, see <http://www.gnu.org/licenses/>.
#include "CaelumPrecompiled.h" #include "CaelumPrecompiled.h"
#include "CaelumPlugin.h" #include "CaelumPlugin.h"
template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::msSingleton = 0; template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::ms_Singleton = 0;
namespace Caelum namespace Caelum
{ {
CaelumPlugin* CaelumPlugin::getSingletonPtr () { CaelumPlugin* CaelumPlugin::getSingletonPtr () {
return msSingleton; return ms_Singleton;
} }
CaelumPlugin& CaelumPlugin::getSingleton () { CaelumPlugin& CaelumPlugin::getSingleton () {
assert (msSingleton); assert (ms_Singleton);
return *msSingleton; return *ms_Singleton;
} }
extern "C" void CAELUM_EXPORT dllStartPlugin () { extern "C" void CAELUM_EXPORT dllStartPlugin () {