Integrate C++11 branch into 5_1-new
This commit is contained in:
+1
-1
@@ -74,7 +74,7 @@ public:
|
||||
void PlaySharedBackgroundOffCommand();
|
||||
void ZeroNextUpdate();
|
||||
private:
|
||||
Screen *m_pInputFocus; // NULL = top of m_ScreenStack
|
||||
Screen *m_pInputFocus; // nullptr = top of m_ScreenStack
|
||||
|
||||
// Screen loads, removals, and concurrent prepares are delayed until the next update.
|
||||
RString m_sDelayedScreen;
|
||||
|
||||
Reference in New Issue
Block a user