ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A few gcc 4.3.x changes. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1551 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2008-11-02 16:46:05 +00:00
parent 5b75962511
commit a1e91c365d
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stella/src/common/FrameBufferGL.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: FrameBufferGL.hxx,v 1.56 2008-08-05 12:54:47 stephena Exp $
// $Id: FrameBufferGL.hxx,v 1.57 2008-11-02 16:46:05 stephena Exp $
//============================================================================
#ifndef FRAMEBUFFER_GL_HXX
@ -26,7 +26,6 @@
#include <SDL_syswm.h>
class OSystem;
class GUI::Font;
class FBSurfaceGL;
#include "bspf.hxx"
@ -36,7 +35,7 @@ class FBSurfaceGL;
This class implements an SDL OpenGL framebuffer.
@author Stephen Anthony
@version $Id: FrameBufferGL.hxx,v 1.56 2008-08-05 12:54:47 stephena Exp $
@version $Id: FrameBufferGL.hxx,v 1.57 2008-11-02 16:46:05 stephena Exp $
*/
class FrameBufferGL : public FrameBuffer
{
@ -202,7 +201,7 @@ class FrameBufferGL : public FrameBuffer
A surface suitable for OpenGL rendering mode.
@author Stephen Anthony
@version $Id: FrameBufferGL.hxx,v 1.56 2008-08-05 12:54:47 stephena Exp $
@version $Id: FrameBufferGL.hxx,v 1.57 2008-11-02 16:46:05 stephena Exp $
*/
class FBSurfaceGL : public FBSurface
{

7
stella/src/common/FrameBufferSoft.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: FrameBufferSoft.hxx,v 1.54 2008-08-04 11:56:11 stephena Exp $
// $Id: FrameBufferSoft.hxx,v 1.55 2008-11-02 16:46:05 stephena Exp $
//============================================================================
#ifndef FRAMEBUFFER_SOFT_HXX
@ -22,7 +22,6 @@
#include <SDL.h>
class OSystem;
class GUI::Font;
class RectList;
#include "bspf.hxx"
@ -33,7 +32,7 @@ class RectList;
This class implements an SDL software framebuffer.
@author Stephen Anthony
@version $Id: FrameBufferSoft.hxx,v 1.54 2008-08-04 11:56:11 stephena Exp $
@version $Id: FrameBufferSoft.hxx,v 1.55 2008-11-02 16:46:05 stephena Exp $
*/
class FrameBufferSoft : public FrameBuffer
{
@ -173,7 +172,7 @@ class FrameBufferSoft : public FrameBuffer
A surface suitable for software rendering mode.
@author Stephen Anthony
@version $Id: FrameBufferSoft.hxx,v 1.54 2008-08-04 11:56:11 stephena Exp $
@version $Id: FrameBufferSoft.hxx,v 1.55 2008-11-02 16:46:05 stephena Exp $
*/
class FBSurfaceSoft : public FBSurface
{

6
stella/src/debugger/RiotDebug.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: RiotDebug.cxx,v 1.6 2008-05-15 18:59:56 stephena Exp $
// $Id: RiotDebug.cxx,v 1.7 2008-11-02 16:46:05 stephena Exp $
//============================================================================
#include <sstream>
@ -265,7 +265,7 @@ string RiotDebug::dirP0String()
<< (reg & 0x40 ? "" : "left ")
<< (reg & 0x20 ? "" : "left ")
<< (reg & 0x10 ? "" : "left ")
<< (reg & 0xf0 == 0xf0 ? "(no directions) " : "");
<< ((reg & 0xf0) == 0xf0 ? "(no directions) " : "");
return buf.str();
}
@ -278,7 +278,7 @@ string RiotDebug::dirP1String()
<< (reg & 0x04 ? "" : "left ")
<< (reg & 0x02 ? "" : "left ")
<< (reg & 0x01 ? "" : "left ")
<< (reg & 0x0f == 0x0f ? "(no directions) " : "");
<< ((reg & 0x0f) == 0x0f ? "(no directions) " : "");
return buf.str();
}

3
stella/src/emucore/Cart.cxx
View File

@ -13,10 +13,11 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: Cart.cxx,v 1.42 2008-05-16 23:56:21 stephena Exp $
// $Id: Cart.cxx,v 1.43 2008-11-02 16:46:05 stephena Exp $
//============================================================================
#include <cassert>
#include <cstring>
#include <sstream>
#include "bspf.hxx"

4
stella/src/emucore/M6532.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: M6532.cxx,v 1.28 2008-08-01 12:16:00 stephena Exp $
// $Id: M6532.cxx,v 1.29 2008-11-02 16:46:05 stephena Exp $
//============================================================================
#include <assert.h>
@ -191,7 +191,7 @@ uInt8 M6532::peek(uInt16 addr)
case 0x05: // Interrupt Flag
case 0x07:
{
if((timerClocks() >= 0) || myInterruptEnabled && myInterruptTriggered)
if((timerClocks() >= 0) || (myInterruptEnabled && myInterruptTriggered))
return 0x00;
else
return 0x80;

8
stella/src/emucore/m6502/src/bspf/src/bspf.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: bspf.hxx,v 1.19 2008-07-22 14:54:39 stephena Exp $
// $Id: bspf.hxx,v 1.20 2008-11-02 16:46:05 stephena Exp $
//============================================================================
#ifndef BSPF_HXX
@ -24,7 +24,7 @@
that need to be defined for different operating systems.
@author Bradford W. Mott
@version $Id: bspf.hxx,v 1.19 2008-07-22 14:54:39 stephena Exp $
@version $Id: bspf.hxx,v 1.20 2008-11-02 16:46:05 stephena Exp $
*/
// Types for 8-bit signed and unsigned integers
@ -51,7 +51,9 @@ typedef unsigned int uInt32;
#include <string>
using namespace std;
#endif
#include <algorithm>
#ifdef HAVE_INTTYPES
#include <inttypes.h>
#endif