summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound/samples.h
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-02-27 23:06:18 +1100
committer Vas Crabb <vas@vastheman.com>2017-02-27 23:06:18 +1100
commit5d48b92701da2aaf79b2d2833692e78d8fc9cb35 (patch)
treea7ead0cd6da675f54ac8db0f9d9e23d64cddbd3c /src/devices/sound/samples.h
parent6c23897483a0201dd0b65b450253fd9bf8fb8723 (diff)
MSVC and clang like it, but not GCC? (nw)
Diffstat (limited to 'src/devices/sound/samples.h')
-rw-r--r--src/devices/sound/samples.h32
1 files changed, 17 insertions, 15 deletions
diff --git a/src/devices/sound/samples.h b/src/devices/sound/samples.h
index 5393d6843f0..8c30cc68357 100644
--- a/src/devices/sound/samples.h
+++ b/src/devices/sound/samples.h
@@ -8,10 +8,19 @@
***************************************************************************/
+#ifndef MAME_DEVICES_SOUND_SAMPLES_H
+#define MAME_DEVICES_SOUND_SAMPLES_H
+
#pragma once
-#ifndef __SAMPLES_H__
-#define __SAMPLES_H__
+
+//**************************************************************************
+// GLOBAL VARIABLES
+//**************************************************************************
+
+// device type definition
+extern const device_type SAMPLES;
+
//**************************************************************************
@@ -123,7 +132,7 @@ protected:
};
// iterator, since lots of people are interested in these devices
-typedef device_type_iterator<device_creator<samples_device>, samples_device> samples_device_iterator;
+typedef device_type_iterator<SAMPLES, samples_device> samples_device_iterator;
// ======================> samples_iterator
@@ -133,8 +142,10 @@ class samples_iterator
public:
// construction/destruction
samples_iterator(samples_device &device)
- : m_samples(device),
- m_current(-1) { }
+ : m_samples(device)
+ , m_current(-1)
+ {
+ }
// getters
const char *altbasename() const { return (m_samples.m_names != nullptr && m_samples.m_names[0] != nullptr && m_samples.m_names[0][0] == '*') ? &m_samples.m_names[0][1] : nullptr; }
@@ -175,13 +186,4 @@ private:
};
-
-//**************************************************************************
-// GLOBAL VARIABLES
-//**************************************************************************
-
-// device type definition
-extern const device_type SAMPLES;
-
-
-#endif
+#endif // MAME_DEVICES_SOUND_SAMPLES_H