From 37e272b3b5e18d1a93a1d69804a96845f8762ba1 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Fri, 13 Jan 2012 20:41:38 +0100
Subject: [PATCH] Issue #178 - workaround for compilation problems with ogre
 1.8.0.

---
 components/bsa/bsa_archive.cpp     | 6 ++++++
 extern/caelum/src/CaelumPlugin.cpp | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/components/bsa/bsa_archive.cpp b/components/bsa/bsa_archive.cpp
index 2178be318e..87b46b34c4 100644
--- a/components/bsa/bsa_archive.cpp
+++ b/components/bsa/bsa_archive.cpp
@@ -221,6 +221,12 @@ 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")
diff --git a/extern/caelum/src/CaelumPlugin.cpp b/extern/caelum/src/CaelumPlugin.cpp
index 288ad9220a..340a26559a 100644
--- a/extern/caelum/src/CaelumPlugin.cpp
+++ b/extern/caelum/src/CaelumPlugin.cpp
@@ -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>::ms_Singleton = 0;
+template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::msSingleton = 0;
 
 namespace Caelum
 {
 	CaelumPlugin* CaelumPlugin::getSingletonPtr () {
-        return ms_Singleton;
+        return msSingleton;
     }
 
     CaelumPlugin& CaelumPlugin::getSingleton () {  
-        assert (ms_Singleton);
-        return *ms_Singleton;  
+        assert (msSingleton);
+        return *msSingleton;  
     }
 
     extern "C" void CAELUM_EXPORT dllStartPlugin () {