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

This reverts commit 37e272b3b5.

It shouldn't be commited and pushed to config branch.
actorid
Lukasz Gromanowski 13 years ago
parent 1d96b99532
commit f4b6caac59

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

@ -21,17 +21,17 @@ along with Caelum. If not, see <http://www.gnu.org/licenses/>.
#include "CaelumPrecompiled.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
{
CaelumPlugin* CaelumPlugin::getSingletonPtr () {
return msSingleton;
return ms_Singleton;
}
CaelumPlugin& CaelumPlugin::getSingleton () {
assert (msSingleton);
return *msSingleton;
assert (ms_Singleton);
return *ms_Singleton;
}
extern "C" void CAELUM_EXPORT dllStartPlugin () {

Loading…
Cancel
Save