Changeset 6764 for code/trunk

Timestamp:

Apr 20, 2010, 11:11:01 AM (15 years ago)

Author:

rgrieder

Message:

Hackaround for Visual Studio 2005 (compiler bug).

File:

• code/trunk/src/orxonox/sound/SoundBuffer.h (modified) (2 diffs)

code/trunk/src/orxonox/sound/SoundBuffer.h

@@ -45 +45 @@
     {
         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_; }
@@ -60 +65 @@
     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);