Re: [openMSX-devel] [openMSX-commits] SF.net SVN: openmsx:[9289] openmsx/trunk/src

[Max A. F. <ma...@co...>]

I'll observe that with this checkin, openMSX now builds cleanly in VC++ at
/W3.

I'd say this is cause for some minor celebration.  :-)

> -----Original Message-----
> From: mfe...@us...
[mailto:mfe...@us...]
> Sent: Saturday, February 28, 2009 11:28
> To: ope...@li...
> Subject: [openMSX-commits] SF.net SVN: openmsx:[9289] openmsx/trunk/src
> 
> Revision: 9289
>           http://openmsx.svn.sourceforge.net/openmsx/?rev=9289&view=rev
> Author:   mfeingol
> Date:     2009-02-28 19:28:15 +0000 (Sat, 28 Feb 2009)
> 
> Log Message:
> -----------
> Fix last VC++ warnings:  C4805
> 
> Modified Paths:
> --------------
>     openmsx/trunk/src/MSXPPI.cc
>     openmsx/trunk/src/fdc/XSADiskImage.cc
>     openmsx/trunk/src/sound/AY8910.cc
>     openmsx/trunk/src/sound/YMF262.cc
>     openmsx/trunk/src/video/VDP.cc
> 
> Modified: openmsx/trunk/src/MSXPPI.cc
> =============================================================
> ======
> --- openmsx/trunk/src/MSXPPI.cc	2009-02-28 18:48:24 UTC (rev 9288)
> +++ openmsx/trunk/src/MSXPPI.cc	2009-02-28 19:28:15 UTC (rev 9289)
> @@ -150,7 +150,7 @@
>         if (selectedRow != 8) {
>                 return keyboard->getKeys()[selectedRow];
>         } else {
> -               return keyboard->getKeys()[8] |
renshaTurbo.getSignal(time);
> +               return keyboard->getKeys()[8] |
(renshaTurbo.getSignal(time) ? 1:0);
>         }
>  }
>  void MSXPPI::writeB(byte /*value*/, EmuTime::param /*time*/)
> 
> Modified: openmsx/trunk/src/fdc/XSADiskImage.cc
> =============================================================
> ======
> --- openmsx/trunk/src/fdc/XSADiskImage.cc	2009-02-28 18:48:24 UTC (rev
> 9288)
> +++ openmsx/trunk/src/fdc/XSADiskImage.cc	2009-02-28 19:28:15 UTC (rev
> 9289)
> @@ -176,7 +176,7 @@
> 
>  	int len = 1;
>  	while (nrbits--) {
> -		len = (len << 1) | bitin();
> +		len = (len << 1) | (bitin() ? 1:0);
>  	}
>  	return (len + 1);
>  }
> @@ -200,13 +200,13 @@
>  	if (cpdbmask[cpdindex] >= 256) {
>  		byte strposlsb = charin();
>  		byte strposmsb = 0;
> -		for (byte nrbits = cpdext[cpdindex]-8; nrbits--; strposmsb
|= bitin()) {
> +		for (byte nrbits = cpdext[cpdindex]-8; nrbits--; strposmsb
|= (bitin() ?
> 1:0)) {
>  			strposmsb <<= 1;
>  		}
>  		strpos = strposlsb + 256 * strposmsb;
>  	} else {
>  		strpos = 0;
> -		for (byte nrbits = cpdext[cpdindex]; nrbits--; strpos |=
bitin()) {
> +		for (byte nrbits = cpdext[cpdindex]; nrbits--; strpos |=
(bitin() ? 1:0)) {
>  			strpos <<= 1;
>  		}
>  	}
> 
> Modified: openmsx/trunk/src/sound/AY8910.cc
> =============================================================
> ======
> --- openmsx/trunk/src/sound/AY8910.cc	2009-02-28 18:48:24 UTC (rev 9288)
> +++ openmsx/trunk/src/sound/AY8910.cc	2009-02-28 19:28:15 UTC (rev
> 9289)
> @@ -335,7 +335,7 @@
> 
>  inline unsigned AY8910::Amplitude::getEnvelopeMask() const
>  {
> -	return envChan[0] | (envChan[1] << 1) | (envChan[2] << 2);
> +	return (envChan[0] ? 1:0) | (envChan[1] ? 2:0) | (envChan[2] ? 4:0);
>  }
> 
>  inline bool AY8910::Amplitude::followsEnvelope(unsigned chan) const
> 
> Modified: openmsx/trunk/src/sound/YMF262.cc
> =============================================================
> ======
> --- openmsx/trunk/src/sound/YMF262.cc	2009-02-28 18:48:24 UTC (rev 9288)
> +++ openmsx/trunk/src/sound/YMF262.cc	2009-02-28 19:28:15 UTC (rev
> 9289)
> @@ -1552,7 +1552,7 @@
>  			unsigned chan_no3 = chan_no + 3;
>  			YMF262Channel& ch0 = getFirstOfPair(chan_no);
>  			YMF262Channel& ch3 = getSecondOfPair(chan_no);
> -			switch ((ch0.slot[MOD].CON << 1) |
ch3.slot[MOD].CON) {
> +			switch ((ch0.slot[MOD].CON ? 2:0) |
(ch3.slot[MOD].CON ?
> 1:0)) {
>  			case 0:
>  				// 1 -> 2 -> 3 -> 4 -> out
>  				ch0.slot[MOD].connect = &phase_modulation;
> 
> Modified: openmsx/trunk/src/video/VDP.cc
> =============================================================
> ======
> --- openmsx/trunk/src/video/VDP.cc	2009-02-28 18:48:24 UTC (rev 9288)
> +++ openmsx/trunk/src/video/VDP.cc	2009-02-28 19:28:15 UTC (rev 9289)
> @@ -674,7 +674,7 @@
>  		return statusReg0;
>  	case 1:
>  		if (controlRegs[0] & 0x10) { // line int enabled
> -			return statusReg1 | irqHorizontal.getState();
> +			return statusReg1 | (irqHorizontal.getState() ?
1:0);
>  		} else { // line int disabled
>  			// FH goes up at the start of the right border of IL
and
>  			// goes down at the start of the next left border.
> 
> 
> This was sent by the SourceForge.net collaborative development platform,
the world's
> largest Open Source development site.
> 
>
----------------------------------------------------------------------------
--
> Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco,
CA
> -OSBC tackles the biggest issue in open source: Open Sourcing the
Enterprise
> -Strategies to boost innovation and cut costs with open source
participation
> -Receive a $600 discount off the registration fee with the source code:
SFAD
> http://p.sf.net/sfu/XcvMzF8H
> _______________________________________________
> openMSX-commits mailing list
> ope...@li...
> https://lists.sourceforge.net/lists/listinfo/openmsx-commits