[Scummvm-git-logs] scummvm master -> b9e7168d01a6bf9a4c464c8488ec55e4e638a411

dwatteau noreply at scummvm.org
Tue Apr 11 09:18:51 UTC 2023


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
73d61b3438 BACKENDS: ENET: Fix MSVC C4245 signed/unsigned mismatch warning
39ed170ad2 HPL1: Fix MSVC C4309 enum sign warning
b9e7168d01 GUI: Fix -Wimplicit-fallthrough warning with GCC on OSX


Commit: 73d61b34386a4354b1335797d320c66e74c4e59f
    https://github.com/scummvm/scummvm/commit/73d61b34386a4354b1335797d320c66e74c4e59f
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-11T11:06:23+02:00

Commit Message:
BACKENDS: ENET: Fix MSVC C4245 signed/unsigned mismatch warning

Changed paths:
    backends/networking/enet/source/host.cpp


diff --git a/backends/networking/enet/source/host.cpp b/backends/networking/enet/source/host.cpp
index ee6bfd8c580..8ac34da24fc 100644
--- a/backends/networking/enet/source/host.cpp
+++ b/backends/networking/enet/source/host.cpp
@@ -329,8 +329,8 @@ enet_host_bandwidth_throttle (ENetHost * host)
     enet_uint32 timeCurrent = enet_time_get (),
            elapsedTime = timeCurrent - host -> bandwidthThrottleEpoch,
            peersRemaining = (enet_uint32) host -> connectedPeers,
-           dataTotal = ~0,
-           bandwidth = ~0,
+           dataTotal = ~0U,
+           bandwidth = ~0U,
            throttle = 0,
            bandwidthLimit = 0;
     int needsAdjustment = host -> bandwidthLimitedPeers > 0 ? 1 : 0;


Commit: 39ed170ad29329e18c24701c6e7245b82f4cc023
    https://github.com/scummvm/scummvm/commit/39ed170ad29329e18c24701c6e7245b82f4cc023
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-11T11:06:23+02:00

Commit Message:
HPL1: Fix MSVC C4309 enum sign warning

Changed paths:
    engines/hpl1/engine/sound/SoundHandler.h


diff --git a/engines/hpl1/engine/sound/SoundHandler.h b/engines/hpl1/engine/sound/SoundHandler.h
index 06a3d53499b..4d5a89b151d 100644
--- a/engines/hpl1/engine/sound/SoundHandler.h
+++ b/engines/hpl1/engine/sound/SoundHandler.h
@@ -41,7 +41,7 @@ class cWorld3D;
 
 //----------------------------------------
 
-enum eSoundDest {
+enum eSoundDest : unsigned int {
 	eSoundDest_World = eFlagBit_0,
 	eSoundDest_Gui = eFlagBit_1,
 	eSoundDest_All = eFlagBit_All


Commit: b9e7168d01a6bf9a4c464c8488ec55e4e638a411
    https://github.com/scummvm/scummvm/commit/b9e7168d01a6bf9a4c464c8488ec55e4e638a411
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-11T11:06:23+02:00

Commit Message:
GUI: Fix -Wimplicit-fallthrough warning with GCC on OSX

Changed paths:
    gui/widgets/editable.cpp


diff --git a/gui/widgets/editable.cpp b/gui/widgets/editable.cpp
index 4efa5a007c2..0dc11f7ac9e 100644
--- a/gui/widgets/editable.cpp
+++ b/gui/widgets/editable.cpp
@@ -424,7 +424,10 @@ bool EditableWidget::handleKeyDown(Common::KeyState state) {
 			}
 			clearSelection();
 			break;
+		} else {
+			defaultKeyDownHandler(state, dirty, forcecaret, handled);
 		}
+		break;
 #endif
 
 	default:




More information about the Scummvm-git-logs mailing list