MSVC and clang like it, but not GCC? (nw)

This commit is contained in:
Vas Crabb 2017-02-27 23:06:18 +11:00
parent 6c23897483
commit 5d48b92701

View File

@ -8,10 +8,19 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_DEVICES_SOUND_SAMPLES_H
#define MAME_DEVICES_SOUND_SAMPLES_H
#pragma once #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 // 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 // ======================> samples_iterator
@ -133,8 +142,10 @@ class samples_iterator
public: public:
// construction/destruction // construction/destruction
samples_iterator(samples_device &device) samples_iterator(samples_device &device)
: m_samples(device), : m_samples(device)
m_current(-1) { } , m_current(-1)
{
}
// getters // 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; } 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:
}; };
#endif // MAME_DEVICES_SOUND_SAMPLES_H
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
// device type definition
extern const device_type SAMPLES;
#endif