diff options
author | Vas Crabb <vas@vastheman.com> | 2018-07-22 20:41:57 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-07-22 20:41:57 +1000 |
commit | c0ab1c5aa4c172aa9e3e0deec5c2cc19d4f278d1 (patch) | |
tree | 359e7b0d6560d05a1872c2e18773a6e2e5038b7f /src/frontend/mame/ui/slider.h | |
parent | 6d39a913e54c73640e4b5e7493b223c87a14c64a (diff) |
(nw) srcclean and some cleanup:
* Make more #include guards follow standard format - using MAME_ as the prefix makes it easy to see which ones come from our code in a preprocessor dump, and having both src/devices/machine/foo.h and src/mame/machine/foo.h causes issues anyway
* Get #include "emu.h" out of headers - it should only be the first thing in a complilation unit or we get differences in behaviour with PCH on/off
* Add out-of-line destructors to some devices - it forces the compiler to instantiate the vtable in a certain location and avoids some non-deterministic compiler behaviours
Diffstat (limited to 'src/frontend/mame/ui/slider.h')
-rw-r--r-- | src/frontend/mame/ui/slider.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/frontend/mame/ui/slider.h b/src/frontend/mame/ui/slider.h index 7c8a1000961..7785518d093 100644 --- a/src/frontend/mame/ui/slider.h +++ b/src/frontend/mame/ui/slider.h @@ -9,29 +9,29 @@ ***************************************************************************/ +#ifndef MAME_FRONTEND_MAME_UI_SLIDER_H +#define MAME_FRONTEND_MAME_UI_SLIDER_H + #pragma once -#ifndef __UI_SLIDER__ -#define __UI_SLIDER__ +#include "sliderchangednotifier.h" #include <functional> -#include "sliderchangednotifier.h" - #define SLIDER_NOCHANGE 0x12345678 -typedef std::function<int32_t(running_machine&, void*, int, std::string*, int32_t)> slider_update; +typedef std::function<std::int32_t (running_machine &, void *, int, std::string *, std::int32_t)> slider_update; struct slider_state { - slider_update update; /* callback */ - void * arg; /* argument */ - int32_t minval; /* minimum value */ - int32_t defval; /* default value */ - int32_t maxval; /* maximum value */ - int32_t incval; /* increment value */ + slider_update update; // callback + void * arg; // argument + std::int32_t minval; // minimum value + std::int32_t defval; // default value + std::int32_t maxval; // maximum value + std::int32_t incval; // increment value int id; - std::string description; /* textual description */ + std::string description; // textual description }; -#endif // __UI_SLIDER__ +#endif // MAME_FRONTEND_MAME_UI_SLIDER_H |