[Orxonox-commit 2047] r6764 - code/trunk/src/orxonox/sound

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-04-20 11:11:01 +0200 (Tue, 20 Apr 2010)
New Revision: 6764

Modified:
   code/trunk/src/orxonox/sound/SoundBuffer.h
Log:
Hackaround for Visual Studio 2005 (compiler bug).

Modified: code/trunk/src/orxonox/sound/SoundBuffer.h
===================================================================
--- code/trunk/src/orxonox/sound/SoundBuffer.h	2010-04-19 16:09:10 UTC (rev 6763)
+++ code/trunk/src/orxonox/sound/SoundBuffer.h	2010-04-20 09:11:01 UTC (rev 6764)
@@ -44,11 +44,16 @@
     class _OrxonoxExport SoundBuffer
     {
         friend class SoundManager;
+#if !defined(_MSC_VER) || _MSC_VER >= 1500
         // Make sure nobody deletes an instance (using smart pointers)
         template <class T>
         friend void boost::checked_delete(T*);
+#endif
 
     public:
+#if defined(_MSC_VER) && _MSC_VER < 1500
+        ~SoundBuffer();
+#endif
         inline ALuint getBuffer()
             { return this->audioBuffer_; }
 
@@ -59,7 +64,9 @@
 
     private:
         SoundBuffer(const std::string& filename, std::list<shared_ptr<SoundBuffer> >::iterator poolIterator);
+#if !defined(_MSC_VER) || _MSC_VER >= 1500
         ~SoundBuffer();
+#endif
         void loadStandard(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
         void loadOgg(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);