1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
Author: Paul Wise <pabs@debian.org>
Description: Fix FTBFS with g++ 4.6
Bug-Debian: http://bugs.debian.org/633297
Forwarded: no
--- a/include/openalsoundsystem.h
+++ b/include/openalsoundsystem.h
@@ -47,7 +47,7 @@
using namespace std;
-typedef map<String, ALuint> SoundMapType;
+typedef std::map<String, ALuint> SoundMapType;
// Number of independent channels for sound fx
const int NUM_SOUND_CHANNELS = 32;
--- a/include/objectsystem.h
+++ b/include/objectsystem.h
@@ -34,7 +34,7 @@
using namespace std;
using namespace Ogre;
-typedef map<String, MovingObject*> ObjectMapType;
+typedef std::map<String, MovingObject*> ObjectMapType;
// ObjectSystem
class ObjectSystem : public Singleton<ObjectSystem> {
--- a/include/mpakogre.h
+++ b/include/mpakogre.h
@@ -49,6 +49,7 @@
void unload();
DataStreamPtr open(const String &filename) const;
+ DataStreamPtr open(const String &filename, bool) const { return open(filename); };
StringVectorPtr list(bool recursive = true, bool dirs = false);
FileInfoListPtr listFileInfo(bool recursive = true, bool dirs = false);
--- a/src/scriptsystem.cpp
+++ b/src/scriptsystem.cpp
@@ -48,7 +48,7 @@
// This keeps track of the lights created in script
-static vector<Light*> scriptLights;
+static std::vector<Light*> scriptLights;
// File locator for script files
--- a/src/playlist.cpp
+++ b/src/playlist.cpp
@@ -42,7 +42,7 @@
using namespace std;
// Play list files
-static vector<String> playList;
+static std::vector<String> playList;
static unsigned int currentSong = -1;
|
