mirror of
https://github.com/izzy2lost/dolphin.git
synced 2026-06-19 01:16:48 -07:00
Merge pull request #58 from lioncash/reppin-pragma-city
Replace all include guard ifdefs with "#pragma once"
This commit is contained in:
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _AOSOUNDSTREAM_H_
|
||||
#define _AOSOUNDSTREAM_H_
|
||||
#pragma once
|
||||
|
||||
#include "SoundStream.h"
|
||||
#include "Thread.h"
|
||||
@@ -53,5 +52,3 @@ public:
|
||||
AOSound(CMixer *mixer) : SoundStream(mixer) {}
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif //_AOSOUNDSTREAM_H_
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _ALSA_SOUND_STREAM_H
|
||||
#define _ALSA_SOUND_STREAM_H
|
||||
#pragma once
|
||||
|
||||
#if defined(HAVE_ALSA) && HAVE_ALSA
|
||||
#include <alsa/asoundlib.h>
|
||||
@@ -52,6 +51,3 @@ public:
|
||||
AlsaSound(CMixer *mixer) : SoundStream(mixer) {}
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _AUDIO_COMMON_H_
|
||||
#define _AUDIO_COMMON_H_
|
||||
#pragma once
|
||||
|
||||
#include "Common.h"
|
||||
#include "SoundStream.h"
|
||||
@@ -47,5 +46,3 @@ namespace AudioCommon
|
||||
void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
|
||||
void UpdateSoundStream();
|
||||
}
|
||||
|
||||
#endif // _AUDIO_COMMON_H_
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _COREAUDIO_SOUND_STREAM_H
|
||||
#define _COREAUDIO_SOUND_STREAM_H
|
||||
#pragma once
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <AudioUnit/AudioUnit.h>
|
||||
@@ -34,7 +33,7 @@ public:
|
||||
|
||||
private:
|
||||
AudioUnit audioUnit;
|
||||
int m_volume;
|
||||
int m_volume;
|
||||
|
||||
static OSStatus callback(void *inRefCon,
|
||||
AudioUnitRenderActionFlags *ioActionFlags,
|
||||
@@ -46,5 +45,3 @@ public:
|
||||
CoreAudioSound(CMixer *mixer) : SoundStream(mixer) {}
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -2,10 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _DPL2DECODER_H_
|
||||
#define _DPL2DECODER_H_
|
||||
#pragma once
|
||||
|
||||
void dpl2decode(float *samples, int numsamples, float *out);
|
||||
void dpl2reset();
|
||||
|
||||
#endif // _DPL2DECODER_H_
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _DSOUNDSTREAM_H_
|
||||
#define _DSOUNDSTREAM_H_
|
||||
#pragma once
|
||||
|
||||
#include "SoundStream.h"
|
||||
#include "Thread.h"
|
||||
@@ -76,5 +75,3 @@ public:
|
||||
{}
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif //_DSOUNDSTREAM_H_
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _MIXER_H_
|
||||
#define _MIXER_H_
|
||||
#pragma once
|
||||
|
||||
#include "WaveFile.h"
|
||||
#include "StdMutex.h"
|
||||
@@ -106,5 +105,3 @@ protected:
|
||||
private:
|
||||
|
||||
};
|
||||
|
||||
#endif // _MIXER_H_
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _NULLSOUNDSTREAM_H_
|
||||
#define _NULLSOUNDSTREAM_H_
|
||||
#pragma once
|
||||
|
||||
#include <stdlib.h>
|
||||
#include "SoundStream.h"
|
||||
@@ -31,5 +30,3 @@ public:
|
||||
virtual bool usesMixer() const { return true; }
|
||||
virtual void Update();
|
||||
};
|
||||
|
||||
#endif //_NULLSOUNDSTREAM_H_
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _OPENALSTREAM_H_
|
||||
#define _OPENALSTREAM_H_
|
||||
#pragma once
|
||||
|
||||
#include "SoundStream.h"
|
||||
#include "Thread.h"
|
||||
@@ -79,5 +78,3 @@ public:
|
||||
{}
|
||||
#endif // HAVE_OPENAL
|
||||
};
|
||||
|
||||
#endif // OPENALSTREAM
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _OPENSLSTREAM_H_
|
||||
#define _OPENSLSTREAM_H_
|
||||
#pragma once
|
||||
|
||||
#include "Thread.h"
|
||||
#include "SoundStream.h"
|
||||
@@ -31,5 +30,3 @@ public:
|
||||
OpenSLESStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {}
|
||||
#endif // HAVE_OPENSL
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _PULSE_AUDIO_STREAM_H
|
||||
#define _PULSE_AUDIO_STREAM_H
|
||||
#pragma once
|
||||
|
||||
#if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO
|
||||
#include <pulse/pulseaudio.h>
|
||||
@@ -61,5 +60,3 @@ public:
|
||||
PulseAudio(CMixer *mixer) : SoundStream(mixer) {}
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _SOUNDSTREAM_H_
|
||||
#define _SOUNDSTREAM_H_
|
||||
#pragma once
|
||||
|
||||
#include "Common.h"
|
||||
#include "Mixer.h"
|
||||
@@ -55,5 +54,3 @@ public:
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
#endif // _SOUNDSTREAM_H_
|
||||
|
||||
@@ -12,8 +12,7 @@
|
||||
// If Stop is not called when it destructs, the destructor will call Stop().
|
||||
// ---------------------------------------------------------------------------------
|
||||
|
||||
#ifndef _WAVEFILE_H_
|
||||
#define _WAVEFILE_H_
|
||||
#pragma once
|
||||
|
||||
#include "FileUtil.h"
|
||||
|
||||
@@ -41,5 +40,3 @@ public:
|
||||
void AddStereoSamplesBE(const short *sample_data, u32 count); // big endian
|
||||
u32 GetAudioSize() const { return audio_size; }
|
||||
};
|
||||
|
||||
#endif // _WAVEFILE_H_
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#ifndef ALDEVICELIST_H
|
||||
#define ALDEVICELIST_H
|
||||
#pragma once
|
||||
|
||||
#include "CommonTypes.h"
|
||||
#ifdef _WIN32
|
||||
@@ -47,5 +46,3 @@ public:
|
||||
private:
|
||||
u32 GetMaxNumSources();
|
||||
};
|
||||
|
||||
#endif // ALDEVICELIST_H
|
||||
|
||||
@@ -1,24 +1,10 @@
|
||||
// Copyright (C) 2003 Dolphin Project.
|
||||
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, version 2.0.
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License 2.0 for more details.
|
||||
|
||||
// A copy of the GPL 2.0 should have been included with the program.
|
||||
// If not, see http://www.gnu.org/licenses/
|
||||
|
||||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
// Copyright 2013 Dolphin Emulator Project
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
// WARNING - THIS LIBRARY IS NOT THREAD SAFE!!!
|
||||
|
||||
#ifndef _DOLPHIN_ARM_CODEGEN_
|
||||
#define _DOLPHIN_ARM_CODEGEN_
|
||||
#pragma once
|
||||
|
||||
#include "Common.h"
|
||||
#include "MemoryUtil.h"
|
||||
@@ -796,5 +782,3 @@ extern const VFPEnc VFPOps[16][2];
|
||||
extern const char *VFPOpNames[16];
|
||||
|
||||
} // namespace
|
||||
|
||||
#endif // _DOLPHIN_INTEL_CODEGEN_
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _ATOMIC_H_
|
||||
#define _ATOMIC_H_
|
||||
#pragma once
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
@@ -15,5 +14,3 @@
|
||||
#include "Atomic_GCC.h"
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _ATOMIC_GCC_H_
|
||||
#define _ATOMIC_GCC_H_
|
||||
#pragma once
|
||||
|
||||
#include "Common.h"
|
||||
|
||||
@@ -86,5 +85,3 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval) {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _ATOMIC_WIN32_H_
|
||||
#define _ATOMIC_WIN32_H_
|
||||
#pragma once
|
||||
|
||||
#include "Common.h"
|
||||
#include <intrin.h>
|
||||
@@ -79,5 +78,3 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval) {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#ifndef _DEBUGGER_BREAKPOINTS_H
|
||||
#define _DEBUGGER_BREAKPOINTS_H
|
||||
#pragma once
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
@@ -97,6 +96,3 @@ public:
|
||||
|
||||
void Clear() { m_MemChecks.clear(); };
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#ifndef _CDUTILS_H_
|
||||
#define _CDUTILS_H_
|
||||
#pragma once
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
@@ -9,5 +8,3 @@ std::vector<std::string> cdio_get_devices();
|
||||
|
||||
// Returns true if device is cdrom/dvd
|
||||
bool cdio_is_cdrom(std::string device);
|
||||
|
||||
#endif // _CDUTILS_H_
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user