more fixes to compiling with gcc 4.6
This commit is contained in:
parent
7d62763c92
commit
092876d0e1
|
@ -45,7 +45,7 @@
|
|||
#if defined(__amd64) || defined(_M_X64)
|
||||
#define BUILD_ARCH "x64"
|
||||
#elif defined(__i386) || defined(_M_IX86) || defined(_X86_)
|
||||
#define BUILD_ARCH "X86"
|
||||
#define BUILD_ARCH "x86"
|
||||
#else
|
||||
#define BUILD_ARCH "unknown"
|
||||
#endif
|
||||
|
|
|
@ -33,8 +33,8 @@ public:
|
|||
virtual ~SoundFile() { }
|
||||
static SoundFilePtr loadSoundFile(const std::string& filename);
|
||||
|
||||
virtual int read(void *buffer, int bufferSize) = 0;
|
||||
virtual void reset() = 0;
|
||||
virtual int read(void *buffer, int bufferSize) { return -1; }
|
||||
virtual void reset() { }
|
||||
bool eof() { return m_file->eof(); }
|
||||
|
||||
ALenum getSampleFormat();
|
||||
|
|
|
@ -55,7 +55,7 @@ public:
|
|||
virtual bool isUIGridLayout() { return false; }
|
||||
|
||||
protected:
|
||||
virtual bool internalUpdate() { }
|
||||
virtual bool internalUpdate() { return false; }
|
||||
|
||||
int m_updateDisabled;
|
||||
stdext::boolean<false> m_updating;
|
||||
|
|
Loading…
Reference in New Issue