fix compiling on gcc 4.6 (too early to use 4.7.1...)

This commit is contained in:
niczkx
2012-07-30 18:47:21 -06:00
parent 39db801f93
commit 4c369bc823
24 changed files with 53 additions and 52 deletions

View File

@@ -68,8 +68,8 @@ protected:
std::string m_appCompactName;
std::string m_appVersion;
std::string m_startupOptions;
bool m_running = false;
bool m_stopping = false;
stdext::boolean<false> m_running;
stdext::boolean<false> m_stopping;
stdext::boolean<false> m_terminated;
};

View File

@@ -40,7 +40,7 @@ public:
private:
std::list<EventPtr> m_eventList;
int m_pollEventsSize;
bool m_disabled = false;
stdext::boolean<false> m_disabled;
std::priority_queue<ScheduledEventPtr, std::vector<ScheduledEventPtr>, lessScheduledEvent> m_scheduledEventList;
};

View File

@@ -60,8 +60,8 @@ protected:
void inputEvent(const InputEvent& event);
private:
bool m_onInputEvent = false;
bool m_mustRepaint = false;
stdext::boolean<false> m_onInputEvent;
stdext::boolean<false> m_mustRepaint;
AdaptativeFrameCounter m_backgroundFrameCounter;
AdaptativeFrameCounter m_foregroundFrameCounter;
TexturePtr m_foreground;

View File

@@ -63,10 +63,10 @@ protected:
friend class ModuleManager;
private:
bool m_loaded = false;
bool m_autoLoad = false;
bool m_reloadable = false;
bool m_sandboxed = false;
stdext::boolean<false> m_loaded;
stdext::boolean<false> m_autoLoad;
stdext::boolean<false> m_reloadable;
stdext::boolean<false> m_sandboxed;
int m_autoLoadPriority;
int m_sandboxEnv;
std::tuple<std::string, std::string> m_onLoadFunc;

View File

@@ -72,7 +72,7 @@ public:
private:
std::string m_workDir;
std::string m_writeDir;
bool m_hasSearchPath = false;
stdext::boolean<false> m_hasSearchPath;
std::deque<std::string> m_searchPaths;
};

View File

@@ -41,7 +41,7 @@ public:
private:
ticks_t m_startTicks;
bool m_stopped = false;
stdext::boolean<false> m_stopped;
};
#endif