Menu
▾
▴
[Stella-commits] SF.net SVN: stella:[3209] trunk/src
|
From: <ste...@us...> - 2015-09-15 15:50:27
|
Revision: 3209
http://sourceforge.net/p/stella/code/3209
Author: stephena
Date: 2015-09-15 15:50:25 +0000 (Tue, 15 Sep 2015)
Log Message:
-----------
More clang warning cleanups.
Modified Paths:
--------------
trunk/src/cheat/CheatManager.cxx
trunk/src/common/tv_filters/atari_ntsc_impl.hxx
trunk/src/debugger/gui/CartMCWidget.cxx
trunk/src/emucore/CartDPCPlus.cxx
trunk/src/emucore/CartWD.cxx
trunk/src/emucore/EventHandler.cxx
trunk/src/emucore/Props.cxx
trunk/src/emucore/TIA.cxx
trunk/src/gui/CheckListWidget.cxx
trunk/src/gui/Dialog.cxx
trunk/src/gui/PopUpWidget.cxx
trunk/src/gui/Widget.cxx
trunk/src/yacc/YaccParser.cxx
Modified: trunk/src/cheat/CheatManager.cxx
===================================================================
--- trunk/src/cheat/CheatManager.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/cheat/CheatManager.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -140,20 +140,10 @@
// Create new cheat based on string length
switch(code.size())
{
- case 4:
- return make_shared<RamCheat>(myOSystem, name, code);
- break;
-
- case 6:
- return make_shared<CheetahCheat>(myOSystem, name, code);
- break;
-
- case 8:
- return make_shared<BankRomCheat>(myOSystem, name, code);
- break;
-
- default:
- return nullptr;
+ case 4: return make_shared<RamCheat>(myOSystem, name, code);
+ case 6: return make_shared<CheetahCheat>(myOSystem, name, code);
+ case 8: return make_shared<BankRomCheat>(myOSystem, name, code);
+ default: return nullptr;
}
}
Modified: trunk/src/common/tv_filters/atari_ntsc_impl.hxx
===================================================================
--- trunk/src/common/tv_filters/atari_ntsc_impl.hxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/common/tv_filters/atari_ntsc_impl.hxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -264,7 +264,7 @@
do
{
float const* in = decoder;
- int n = 3;
+ int n2 = 3;
do
{
float i = *in++;
@@ -272,7 +272,7 @@
*out++ = i * c - q * s;
*out++ = i * s + q * c;
}
- while ( --n );
+ while ( --n2 );
if ( burst_count <= 1 )
break;
ROTATE_IQ( s, c, 0.866025f, -0.5f ); /* +120 degrees */
@@ -364,9 +364,9 @@
++pixel;
for ( n = rgb_kernel_size; n; --n )
{
- float i = k[0]*ic0 + k[2]*ic2;
- float q = k[1]*qc1 + k[3]*qc3;
- float y = k[kernel_size+0]*yc0 + k[kernel_size+1]*yc1 +
+ float fi = k[0]*ic0 + k[2]*ic2;
+ float fq = k[1]*qc1 + k[3]*qc3;
+ float fy = k[kernel_size+0]*yc0 + k[kernel_size+1]*yc1 +
k[kernel_size+2]*yc2 + k[kernel_size+3]*yc3 + rgb_offset;
if ( rescale_out <= 1 )
k--;
@@ -375,7 +375,7 @@
else
k -= kernel_size * 2 * (rescale_out - 1) + 2;
{
- int r, g, b = YIQ_TO_RGB( y, i, q, to_rgb, int, r, g );
+ int r, g, b = YIQ_TO_RGB( fy, fi, fq, to_rgb, int, r, g );
*out++ = PACK_RGB( r, g, b ) - rgb_bias;
}
}
Modified: trunk/src/debugger/gui/CartMCWidget.cxx
===================================================================
--- trunk/src/debugger/gui/CartMCWidget.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/debugger/gui/CartMCWidget.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -28,8 +28,6 @@
: CartDebugWidget(boss, lfont, nfont, x, y, w, h),
myCart(cart)
{
-#define ROM_BLOCKS
-
uInt32 size = 128 * 1024;
string info =
Modified: trunk/src/emucore/CartDPCPlus.cxx
===================================================================
--- trunk/src/emucore/CartDPCPlus.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/emucore/CartDPCPlus.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -144,7 +144,7 @@
inline void CartridgeDPCPlus::priorClockRandomNumberGenerator()
{
// Update random number generator (32-bit LFSR, reversed)
- myRandomNumber = ((myRandomNumber & (1<<31)) ?
+ myRandomNumber = ((myRandomNumber & (1u<<31)) ?
((0x10adab1e^myRandomNumber) << 11) | ((0x10adab1e^myRandomNumber) >> 21) :
(myRandomNumber << 11) | (myRandomNumber >> 21));
}
Modified: trunk/src/emucore/CartWD.cxx
===================================================================
--- trunk/src/emucore/CartWD.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/emucore/CartWD.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -144,7 +144,7 @@
return mySegment3[address & 0x03FF];
}
- return 0; // We'll never reach this
+ return 0; // Make the compiler happy; we'll never reach this
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Modified: trunk/src/emucore/EventHandler.cxx
===================================================================
--- trunk/src/emucore/EventHandler.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/emucore/EventHandler.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -1140,7 +1140,6 @@
break;
default:
return;
- break;
}
ostringstream buf;
@@ -1582,7 +1581,6 @@
default:
return;
- break;
}
setActionMappings(mode);
}
@@ -1744,16 +1742,13 @@
return Event::NoType;
else
return ourEmulActionList[idx].event;
- break;
case kMenuMode:
if(idx < 0 || idx >= kMenuActionListSize)
return Event::NoType;
else
return ourMenuActionList[idx].event;
- break;
default:
return Event::NoType;
- break;
}
}
@@ -1767,16 +1762,13 @@
return EmptyString;
else
return ourEmulActionList[idx].action;
- break;
case kMenuMode:
if(idx < 0 || idx >= kMenuActionListSize)
return EmptyString;
else
return ourMenuActionList[idx].action;
- break;
default:
return EmptyString;
- break;
}
}
@@ -1790,16 +1782,13 @@
return EmptyString;
else
return ourEmulActionList[idx].key;
- break;
case kMenuMode:
if(idx < 0 || idx >= kMenuActionListSize)
return EmptyString;
else
return ourMenuActionList[idx].key;
- break;
default:
return EmptyString;
- break;
}
}
Modified: trunk/src/emucore/Props.cxx
===================================================================
--- trunk/src/emucore/Props.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/emucore/Props.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -61,7 +61,7 @@
case Display_Phosphor:
{
transform(myProperties[key].begin(), myProperties[key].end(),
- myProperties[key].begin(), (int(*)(int)) toupper);
+ myProperties[key].begin(), ::toupper);
break;
}
Modified: trunk/src/emucore/TIA.cxx
===================================================================
--- trunk/src/emucore/TIA.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/emucore/TIA.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -1299,7 +1299,7 @@
else
return 0x00;
}
- return 0x00;
+ return 0x00; // Make the compiler happy; we'll never reach this
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Modified: trunk/src/gui/CheckListWidget.cxx
===================================================================
--- trunk/src/gui/CheckListWidget.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/gui/CheckListWidget.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -166,11 +166,9 @@
// Simulate a mouse button click
_checkList[ListWidget::getSelected()]->handleMouseUp(0, 0, 1, 0);
return true;
- break;
default:
return ListWidget::handleEvent(e);
- break;
}
}
Modified: trunk/src/gui/Dialog.cxx
===================================================================
--- trunk/src/gui/Dialog.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/gui/Dialog.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -587,7 +587,6 @@
default:
return false;
- break;
}
return false;
}
Modified: trunk/src/gui/PopUpWidget.cxx
===================================================================
--- trunk/src/gui/PopUpWidget.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/gui/PopUpWidget.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -25,8 +25,6 @@
#include "PopUpWidget.hxx"
-#define UP_DOWN_BOX_HEIGHT 10
-
// Little up/down arrow
static uInt32 up_down_arrows[8] = {
0x00000000,
Modified: trunk/src/gui/Widget.cxx
===================================================================
--- trunk/src/gui/Widget.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/gui/Widget.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -670,7 +670,6 @@
default:
return false;
- break;
}
return true;
}
Modified: trunk/src/yacc/YaccParser.cxx
===================================================================
--- trunk/src/yacc/YaccParser.cxx 2015-09-15 12:39:07 UTC (rev 3208)
+++ trunk/src/yacc/YaccParser.cxx 2015-09-15 15:50:25 UTC (rev 3209)
@@ -332,9 +332,8 @@
return o;
}
}
+ // break; Never executed
- break;
-
case ST_DEFAULT:
default:
yylval.val = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|