mirror of
https://github.com/holub/mame
synced 2025-07-05 18:08:04 +03:00
algorithm-> utility where appropriate, fix imgtool (nw)
This commit is contained in:
parent
184f7e5605
commit
185f5059fb
@ -24,7 +24,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#undef min
|
#undef min
|
||||||
#undef max
|
#undef max
|
||||||
#include <algorithm>
|
#include <utility>
|
||||||
|
|
||||||
#include "modules/lib/osdlib.h"
|
#include "modules/lib/osdlib.h"
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#undef min
|
#undef min
|
||||||
#undef max
|
#undef max
|
||||||
#include <algorithm>
|
#include <utility>
|
||||||
|
|
||||||
|
|
||||||
//============================================================
|
//============================================================
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
#undef min
|
#undef min
|
||||||
#undef max
|
#undef max
|
||||||
|
|
||||||
#include <algorithm>
|
#include <utility>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
#include "../frontend/mame/ui/slider.h"
|
#include "../frontend/mame/ui/slider.h"
|
||||||
#undef min
|
#undef min
|
||||||
#undef max
|
#undef max
|
||||||
#include <algorithm>
|
#include <utility>
|
||||||
|
|
||||||
//============================================================
|
//============================================================
|
||||||
// PROTOTYPES
|
// PROTOTYPES
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include "modules/render/d3d/d3dhlsl.h"
|
#include "modules/render/d3d/d3dhlsl.h"
|
||||||
#undef min
|
#undef min
|
||||||
#undef max
|
#undef max
|
||||||
#include <algorithm>
|
#include <utility>
|
||||||
|
|
||||||
//============================================================
|
//============================================================
|
||||||
// TYPE DEFINITIONS
|
// TYPE DEFINITIONS
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
#include "winmain.h"
|
#include "winmain.h"
|
||||||
#include "window.h"
|
#include "window.h"
|
||||||
#endif
|
#endif
|
||||||
#include <algorithm>
|
#include <utility>
|
||||||
|
|
||||||
//============================================================
|
//============================================================
|
||||||
// DEBUGGING
|
// DEBUGGING
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include <thread>
|
#include <thread>
|
||||||
#include <queue>
|
#include <queue>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <algorithm>
|
#include <utility>
|
||||||
|
|
||||||
// MAME headers
|
// MAME headers
|
||||||
#include "emu.h"
|
#include "emu.h"
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#undef min
|
#undef min
|
||||||
#undef max
|
#undef max
|
||||||
#include <algorithm>
|
#include <utility>
|
||||||
// MAME headers
|
// MAME headers
|
||||||
#include "osdcore.h"
|
#include "osdcore.h"
|
||||||
#include "osdsync.h"
|
#include "osdsync.h"
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#endif
|
#endif
|
||||||
#undef min
|
#undef min
|
||||||
#undef max
|
#undef max
|
||||||
#include <algorithm>
|
#include <utility>
|
||||||
// MAMEOS headers
|
// MAMEOS headers
|
||||||
#include "strconv.h"
|
#include "strconv.h"
|
||||||
|
|
||||||
|
@ -373,7 +373,7 @@ UINT64 stream_transfer(imgtool_stream *dest, imgtool_stream *source, UINT64 sz)
|
|||||||
UINT64 readsz;
|
UINT64 readsz;
|
||||||
char buf[1024];
|
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);
|
stream_write(dest, buf, readsz);
|
||||||
sz -= readsz;
|
sz -= readsz;
|
||||||
|
Loading…
Reference in New Issue
Block a user