diff options
author | 2016-07-31 15:37:37 +0200 | |
---|---|---|
committer | 2016-07-31 15:37:37 +0200 | |
commit | 185f5059fb5afe6f4aa08b19410b38d60ab1aff2 (patch) | |
tree | 6dd5e35b7d551a9216fc6f1baafeb769998b1563 | |
parent | 184f7e5605c9e856648fc072ec2af54d2efb74d0 (diff) |
algorithm-> utility where appropriate, fix imgtool (nw)
-rw-r--r-- | src/osd/modules/diagnostics/diagnostics_win32.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/input/input_common.h | 2 | ||||
-rw-r--r-- | src/osd/modules/input/input_dinput.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/render/d3d/d3dhlsl.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/render/drawd3d.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/sound/direct_sound.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/sound/xaudio2_sound.cpp | 2 | ||||
-rw-r--r-- | src/osd/osdsync.cpp | 2 | ||||
-rw-r--r-- | src/osd/strconv.cpp | 2 | ||||
-rw-r--r-- | src/tools/imgtool/stream.cpp | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/src/osd/modules/diagnostics/diagnostics_win32.cpp b/src/osd/modules/diagnostics/diagnostics_win32.cpp index 8179e333187..cdacba72ceb 100644 --- a/src/osd/modules/diagnostics/diagnostics_win32.cpp +++ b/src/osd/modules/diagnostics/diagnostics_win32.cpp @@ -24,7 +24,7 @@ #include <vector> #undef min #undef max -#include <algorithm> +#include <utility> #include "modules/lib/osdlib.h" diff --git a/src/osd/modules/input/input_common.h b/src/osd/modules/input/input_common.h index 741376ecb81..d3ac27a7862 100644 --- a/src/osd/modules/input/input_common.h +++ b/src/osd/modules/input/input_common.h @@ -20,7 +20,7 @@ #include <string> #undef min #undef max -#include <algorithm> +#include <utility> //============================================================ diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp index 0ef0fc2d095..f12e30a26c2 100644 --- a/src/osd/modules/input/input_dinput.cpp +++ b/src/osd/modules/input/input_dinput.cpp @@ -25,7 +25,7 @@ #undef min #undef max -#include <algorithm> +#include <utility> #include <mutex> #include <thread> diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp index 560bffa1379..e41008e03c2 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.cpp +++ b/src/osd/modules/render/d3d/d3dhlsl.cpp @@ -27,7 +27,7 @@ #include "../frontend/mame/ui/slider.h" #undef min #undef max -#include <algorithm> +#include <utility> //============================================================ // PROTOTYPES diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp index 7668cb6660f..1035a875bc2 100644 --- a/src/osd/modules/render/drawd3d.cpp +++ b/src/osd/modules/render/drawd3d.cpp @@ -21,7 +21,7 @@ #include "modules/render/d3d/d3dhlsl.h" #undef min #undef max -#include <algorithm> +#include <utility> //============================================================ // TYPE DEFINITIONS diff --git a/src/osd/modules/sound/direct_sound.cpp b/src/osd/modules/sound/direct_sound.cpp index b677889de6b..745a20932f0 100644 --- a/src/osd/modules/sound/direct_sound.cpp +++ b/src/osd/modules/sound/direct_sound.cpp @@ -36,7 +36,7 @@ #include "winmain.h" #include "window.h" #endif -#include <algorithm> +#include <utility> //============================================================ // DEBUGGING diff --git a/src/osd/modules/sound/xaudio2_sound.cpp b/src/osd/modules/sound/xaudio2_sound.cpp index c4923a9571c..dc14acff64d 100644 --- a/src/osd/modules/sound/xaudio2_sound.cpp +++ b/src/osd/modules/sound/xaudio2_sound.cpp @@ -29,7 +29,7 @@ #include <thread> #include <queue> #include <chrono> -#include <algorithm> +#include <utility> // MAME headers #include "emu.h" diff --git a/src/osd/osdsync.cpp b/src/osd/osdsync.cpp index a782d287e1d..7fcc22b4217 100644 --- a/src/osd/osdsync.cpp +++ b/src/osd/osdsync.cpp @@ -23,7 +23,7 @@ #include <vector> #undef min #undef max -#include <algorithm> +#include <utility> // MAME headers #include "osdcore.h" #include "osdsync.h" diff --git a/src/osd/strconv.cpp b/src/osd/strconv.cpp index 7ab8f2f401b..6b754bbe7f1 100644 --- a/src/osd/strconv.cpp +++ b/src/osd/strconv.cpp @@ -11,7 +11,7 @@ #endif #undef min #undef max -#include <algorithm> +#include <utility> // MAMEOS headers #include "strconv.h" diff --git a/src/tools/imgtool/stream.cpp b/src/tools/imgtool/stream.cpp index 417a33ed8b1..3bb57c87223 100644 --- a/src/tools/imgtool/stream.cpp +++ b/src/tools/imgtool/stream.cpp @@ -373,7 +373,7 @@ UINT64 stream_transfer(imgtool_stream *dest, imgtool_stream *source, UINT64 sz) UINT64 readsz; char buf[1024]; - while(sz && (readsz = stream_read(source, buf, std::min(sz, sizeof(buf))))) + while(sz && (readsz = stream_read(source, buf, std::min(sz, UINT64(sizeof(buf)))))) { stream_write(dest, buf, readsz); sz -= readsz; |