From 092876d0e1e0c574dd44248ff37f3b96fed93a57 Mon Sep 17 00:00:00 2001 From: niczkx Date: Fri, 3 Aug 2012 15:03:34 -0600 Subject: [PATCH] more fixes to compiling with gcc 4.6 --- src/framework/const.h | 2 +- src/framework/sound/soundfile.h | 4 ++-- src/framework/ui/uilayout.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/framework/const.h b/src/framework/const.h index f103b0cc..90b8e448 100644 --- a/src/framework/const.h +++ b/src/framework/const.h @@ -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 diff --git a/src/framework/sound/soundfile.h b/src/framework/sound/soundfile.h index 30fa1863..63883c8d 100644 --- a/src/framework/sound/soundfile.h +++ b/src/framework/sound/soundfile.h @@ -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(); diff --git a/src/framework/ui/uilayout.h b/src/framework/ui/uilayout.h index 2b3ce292..089fc172 100644 --- a/src/framework/ui/uilayout.h +++ b/src/framework/ui/uilayout.h @@ -55,7 +55,7 @@ public: virtual bool isUIGridLayout() { return false; } protected: - virtual bool internalUpdate() { } + virtual bool internalUpdate() { return false; } int m_updateDisabled; stdext::boolean m_updating;