Changeset 3139 for code/branches

Timestamp:

Jun 10, 2009, 4:04:42 PM (15 years ago)

Author:

rgrieder

Message:

Typedef is probably better here than a static assert.

Location:

code/branches/pch/src/orxonox/sound

Files:

• SoundBase.cc (modified) (2 diffs)
• SoundBase.h (modified) (2 diffs)

code/branches/pch/src/orxonox/sound/SoundBase.cc

@@ -32 +32 @@
 #include <AL/alut.h>
 #include <vorbis/vorbisfile.h>
-#include <boost/static_assert.hpp>
 
 #include "util/Math.h"
@@ -38 +37 @@
 #include "orxonox/objects/worldentities/WorldEntity.h"
 #include "SoundManager.h"
-
-// Make sure we correctly avoid including al.h in the header
-BOOST_STATIC_ASSERT(sizeof(uint32_t) == sizeof(ALuint));
-BOOST_STATIC_ASSERT(sizeof(int32_t)  == sizeof(ALint));
 
 namespace orxonox 

code/branches/pch/src/orxonox/sound/SoundBase.h

@@ -32 +32 @@
 #include <string>
 
+// forward declarations
+typedef unsigned int ALuint;
+typedef int ALint;
+
 namespace orxonox
 {
@@ -58 +62 @@
 
     private:
-        uint32_t loadOggFile(std::string filename);
-        uint32_t source_;
-        uint32_t buffer_;
+        ALuint loadOggFile(std::string filename);
+        ALuint source_;
+        ALuint buffer_;
         WorldEntity* entity_;
 
-        int32_t getSourceState();
+        ALint getSourceState();
 
         static SoundManager* soundmanager_s;