Use #pragma once instead of include guards.
--- a/src/in_2sf/desmume/FIFO.h
+++ b/src/in_2sf/desmume/FIFO.h
@@ -17,8 +17,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef FIFO_H
-#define FIFO_H
+#pragma once
#include "types.h"
@@ -38,5 +37,3 @@
extern uint32_t IPC_FIFOrecv(uint8_t proc);
extern void IPC_FIFOcnt(uint8_t proc, uint16_t val);
-#endif
-
--- a/src/in_2sf/desmume/MMU.h
+++ b/src/in_2sf/desmume/MMU.h
@@ -17,8 +17,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MMU_H
-#define MMU_H
+#pragma once
#include "FIFO.h"
#include "mem.h"
@@ -813,5 +812,3 @@
template<int PROCNUM, MMU_ACCESS_TYPE AT> inline void _MMU_write16(uint32_t addr, uint16_t val) { _MMU_write16(PROCNUM, AT, addr, val); }
template<int PROCNUM, MMU_ACCESS_TYPE AT> inline void _MMU_write32(uint32_t addr, uint32_t val) { _MMU_write32(PROCNUM, AT, addr, val); }
-#endif
-
--- a/src/in_2sf/desmume/MMU_timing.h
+++ b/src/in_2sf/desmume/MMU_timing.h
@@ -20,8 +20,7 @@
// this file is split from MMU.h for the purpose of avoiding ridiculous recompile times
// when changing it, because practically everything includes MMU.h.
-#ifndef MMUTIMING_H
-#define MMUTIMING_H
+#pragma once
#include <algorithm>
#include <cmath>
@@ -383,5 +382,3 @@
return executeCycles;
}
-#endif // MMUTIMING_H
-
--- a/src/in_2sf/desmume/NDSSystem.h
+++ b/src/in_2sf/desmume/NDSSystem.h
@@ -16,8 +16,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef NDSSYSTEM_H
-#define NDSSYSTEM_H
+#pragma once
#include <memory>
#include <string>
@@ -332,5 +331,3 @@
bool spu_advanced;
} CommonSettings;
-#endif
-
--- a/src/in_2sf/desmume/SPU.h
+++ b/src/in_2sf/desmume/SPU.h
@@ -16,8 +16,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SPU_H
-#define SPU_H
+#pragma once
#include <iosfwd>
#include <string>
@@ -208,5 +207,3 @@
const int DESMUME_SAMPLE_RATE = 44100;
//#define DESMUME_SAMPLE_RATE 48000
-#endif
-
--- a/src/in_2sf/desmume/arm_jit.h
+++ b/src/in_2sf/desmume/arm_jit.h
@@ -16,8 +16,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ARM_JIT
-#define ARM_JIT
+#pragma once
#include "types.h"
@@ -63,6 +62,3 @@
inline bool JIT_MAPPED(uint32_t adr, uint32_t PROCNUM) { return true; }
#endif
-
-#endif
-
--- a/src/in_2sf/desmume/armcpu.h
+++ b/src/in_2sf/desmume/armcpu.h
@@ -16,8 +16,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ARM_CPU
-#define ARM_CPU
+#pragma once
#include "types.h"
#include "bits.h"
@@ -246,5 +245,3 @@
setIF(PROCNUM, 1 << num);
}
-#endif
-
--- a/src/in_2sf/desmume/bios.h
+++ b/src/in_2sf/desmume/bios.h
@@ -16,12 +16,9 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BIOS_H
-#define BIOS_H
+#pragma once
#include "armcpu.h"
extern uint32_t (*ARM_swi_tab[2][32])();
-#endif
-
--- a/src/in_2sf/desmume/bits.h
+++ b/src/in_2sf/desmume/bits.h
@@ -1,5 +1,4 @@
-#ifndef BITS_H
-#define BITS_H
+#pragma once
inline uint32_t BIT(uint32_t n) { return 1 << n; }
@@ -41,5 +40,3 @@
inline uint32_t REG_POS(uint32_t i, uint32_t n) { return (i >> n) & 0xF; }
-#endif
-
--- a/src/in_2sf/desmume/cp15.h
+++ b/src/in_2sf/desmume/cp15.h
@@ -16,8 +16,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __CP15_H__
-#define __CP15_H__
+#pragma once
#include "armcpu.h"
@@ -111,5 +110,3 @@
extern armcp15_t cp15;
void maskPrecalc();
-#endif /* __CP15_H__*/
-
--- a/src/in_2sf/desmume/emufile.h
+++ b/src/in_2sf/desmume/emufile.h
@@ -24,8 +24,7 @@
// don't use emufile for files bigger than 2GB! you have been warned! some day this will be fixed.
-#ifndef EMUFILE_H
-#define EMUFILE_H
+#pragma once
#include <vector>
#include <algorithm>
@@ -209,5 +208,3 @@
}
};
-#endif
-
--- a/src/in_2sf/desmume/firmware.h
+++ b/src/in_2sf/desmume/firmware.h
@@ -15,8 +15,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _FIRMWARE_H_
-#define _FIRMWARE_H_
+#pragma once
#include <memory>
#include "types.h"
@@ -81,5 +80,3 @@
int copy_firmware_user_data(uint8_t *dest_buffer, const uint8_t *fw_data);
void NDS_FillDefaultFirmwareConfigData(struct NDS_fw_config_data *fw_config);
-#endif
-
--- a/src/in_2sf/desmume/instruction_attributes.h
+++ b/src/in_2sf/desmume/instruction_attributes.h
@@ -16,8 +16,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef instruction_attributes_H_
-#define instruction_attributes_H_
+#pragma once
#include "types.h"
@@ -5171,5 +5170,3 @@
INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
};
-#endif
-
--- a/src/in_2sf/desmume/instructions.h
+++ b/src/in_2sf/desmume/instructions.h
@@ -15,14 +15,11 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _INSTRUCIONS_H_
-#define _INSTRUCIONS_H_
+#pragma once
typedef uint32_t (FASTCALL *OpFunc)(uint32_t i);
extern const OpFunc arm_instructions_set[2][4096];
-extern const char* arm_instruction_names[4096];
+extern const char *arm_instruction_names[4096];
extern const OpFunc thumb_instructions_set[2][1024];
-extern const char* thumb_instruction_names[1024];
+extern const char *thumb_instruction_names[1024];
-#endif
-
--- a/src/in_2sf/desmume/matrix.h
+++ b/src/in_2sf/desmume/matrix.h
@@ -16,8 +16,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MATRIX_H
-#define MATRIX_H
+#pragma once
#include <cmath>
#include <cstring>
@@ -63,5 +62,3 @@
return s32floor(static_cast<float>(d));
}
-#endif
-
--- a/src/in_2sf/desmume/mc.h
+++ b/src/in_2sf/desmume/mc.h
@@ -17,8 +17,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __FW_H__
-#define __FW_H__
+#pragma once
#include <vector>
#include <string>
@@ -163,5 +162,3 @@
int size;
};
-#endif /*__FW_H__*/
-
--- a/src/in_2sf/desmume/mem.h
+++ b/src/in_2sf/desmume/mem.h
@@ -17,8 +17,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MEM_H
-#define MEM_H
+#pragma once
#include <cstdlib>
#include <cassert>
@@ -130,5 +129,3 @@
#endif
}
-#endif
-
--- a/src/in_2sf/desmume/metaspu/SndOut.h
+++ b/src/in_2sf/desmume/metaspu/SndOut.h
@@ -15,8 +15,7 @@
* along with SPU2-X. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SNDOUT_H
-#define SNDOUT_H
+#pragma once
#include <memory>
#include <algorithm>
@@ -214,5 +213,3 @@
}
};
-#endif
-
--- a/src/in_2sf/desmume/metaspu/SoundTouch/AAFilter.h
+++ b/src/in_2sf/desmume/metaspu/SoundTouch/AAFilter.h
@@ -41,8 +41,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-#ifndef AAFilter_H
-#define AAFilter_H
+#pragma once
#include "FIRFilter.h"
@@ -84,5 +83,3 @@
}
-#endif
-
--- a/src/in_2sf/desmume/metaspu/SoundTouch/FIFOSampleBuffer.h
+++ b/src/in_2sf/desmume/metaspu/SoundTouch/FIFOSampleBuffer.h
@@ -43,8 +43,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-#ifndef FIFOSampleBuffer_H
-#define FIFOSampleBuffer_H
+#pragma once
#include <memory>
#include "FIFOSamplePipe.h"
@@ -172,5 +171,3 @@
}
-#endif
-
--- a/src/in_2sf/desmume/metaspu/SoundTouch/FIFOSamplePipe.h
+++ b/src/in_2sf/desmume/metaspu/SoundTouch/FIFOSamplePipe.h
@@ -45,8 +45,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-#ifndef FIFOSamplePipe_H
-#define FIFOSamplePipe_H
+#pragma once
#include <cassert>
#include "STTypes.h"
@@ -216,5 +215,3 @@
}
-#endif
-
--- a/src/in_2sf/desmume/metaspu/SoundTouch/FIRFilter.h
+++ b/src/in_2sf/desmume/metaspu/SoundTouch/FIRFilter.h
@@ -39,8 +39,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-#ifndef FIRFilter_H
-#define FIRFilter_H
+#pragma once
#include <memory>
#include "STTypes.h"
@@ -128,5 +127,3 @@
}
-#endif // FIRFilter_H
-
--- a/src/in_2sf/desmume/metaspu/SoundTouch/RateTransposer.h
+++ b/src/in_2sf/desmume/metaspu/SoundTouch/RateTransposer.h
@@ -42,8 +42,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-#ifndef RateTransposer_H
-#define RateTransposer_H
+#pragma once
#include "AAFilter.h"
#include "FIFOSampleBuffer.h"
@@ -142,5 +141,3 @@
}
-#endif
-
--- a/src/in_2sf/desmume/metaspu/SoundTouch/STTypes.h
+++ b/src/in_2sf/desmume/metaspu/SoundTouch/STTypes.h
@@ -36,8 +36,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-#ifndef STTypes_H
-#define STTypes_H
+#pragma once
#include <cstdint>
@@ -131,5 +130,3 @@
}
-#endif
-
--- a/src/in_2sf/desmume/metaspu/SoundTouch/SoundTouch.h
+++ b/src/in_2sf/desmume/metaspu/SoundTouch/SoundTouch.h
@@ -69,8 +69,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-#ifndef SoundTouch_H
-#define SoundTouch_H
+#pragma once
#include <memory>
#include "FIFOSamplePipe.h"
@@ -239,5 +238,3 @@
}
-#endif
-
--- a/src/in_2sf/desmume/metaspu/SoundTouch/TDStretch.h
+++ b/src/in_2sf/desmume/metaspu/SoundTouch/TDStretch.h
@@ -41,8 +41,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-#ifndef TDStretch_H
-#define TDStretch_H
+#pragma once
#include <memory>
#include "RateTransposer.h"
@@ -244,5 +243,3 @@
}
-#endif /// TDStretch_H
-
--- a/src/in_2sf/desmume/metaspu/SoundTouch/cpu_detect.h
+++ b/src/in_2sf/desmume/metaspu/SoundTouch/cpu_detect.h
@@ -40,8 +40,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-#ifndef _CPU_DETECT_H_
-#define _CPU_DETECT_H_
+#pragma once
#include "STTypes.h"
@@ -57,5 +56,3 @@
/// Disables given set of instruction extensions. See SUPPORT_... defines.
void disableExtensions(uint32_t wDisableMask);
-#endif // _CPU_DETECT_H_
-
--- a/src/in_2sf/desmume/metaspu/metaspu.h
+++ b/src/in_2sf/desmume/metaspu/metaspu.h
@@ -20,8 +20,7 @@
// and is designed to be as portable between multiple emulators
// -------------------------
-#ifndef _METASPU_H_
-#define _METASPU_H_
+#pragma once
#include "../types.h"
@@ -49,5 +48,3 @@
ISynchronizingAudioBuffer *metaspu_construct(ESynchMethod method);
-#endif
-
--- a/src/in_2sf/desmume/readwrite.h
+++ b/src/in_2sf/desmume/readwrite.h
@@ -15,8 +15,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _READWRITE_H_
-#define _READWRITE_H_
+#pragma once
#include <iostream>
#include <vector>
@@ -43,5 +42,3 @@
int readbuffer(std::vector<uint8_t> &vec, EMUFILE *is);
-#endif
-
--- a/src/in_2sf/desmume/registers.h
+++ b/src/in_2sf/desmume/registers.h
@@ -16,8 +16,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef REGISTERS_H
-#define REGISTERS_H
+#pragma once
#define REG_REGION_MASK 0x0FFFEF80
#define REG_BASE_DISPx 0x04000000
@@ -428,5 +427,3 @@
#define EXMEMCNT_MASK_SLOT2_ROM_2ND_TIME (1<<4)
#define EXMEMCNT_MASK_SLOT2_CLOCKRATE (3<<5)
-#endif
-
--- a/src/in_2sf/desmume/slot1.h
+++ b/src/in_2sf/desmume/slot1.h
@@ -15,8 +15,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __SLOT1_H__
-#define __SLOT1_H__
+#pragma once
#include "types.h"
@@ -59,5 +58,3 @@
NDS_SLOT1_COUNT // use for counter addons - MUST TO BE LAST!!!
};
-#endif // __ADDONS_H__
-
--- a/src/in_2sf/desmume/types.h
+++ b/src/in_2sf/desmume/types.h
@@ -16,8 +16,7 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TYPES_HPP
-#define TYPES_HPP
+#pragma once
#include <cstdint>
@@ -139,5 +138,3 @@
new(t) T();
}
-#endif
-
--- a/src/in_2sf/desmume/utils/AsmJit/AsmJit.h
+++ b/src/in_2sf/desmume/utils/AsmJit/AsmJit.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_ASMJIT_H
-#define _ASMJIT_ASMJIT_H
+#pragma once
//! @mainpage
//!
@@ -338,6 +336,3 @@
#include "x86.h"
#endif // ASMJIT_X86 || ASMJIT_X64
-// [Guard]
-#endif // _ASMJIT_ASMJIT_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/Config.h
+++ b/src/in_2sf/desmume/utils/AsmJit/Config.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CONFIG_H
-#define _ASMJIT_CONFIG_H
+#pragma once
// This file is designed to be modifyable. Platform specific changes should
// be applied to this file so it's guaranteed that never versions of AsmJit
@@ -61,6 +59,3 @@
// Setup custom assertion code.
// #define ASMJIT_ASSERT(exp) do { if (!(exp)) ::AsmJit::assertionFailure(__FILE__, __LINE__, #exp); } while(0)
-// [Guard]
-#endif // _ASMJIT_CONFIG_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_H
-#define _ASMJIT_CORE_H
+#pragma once
// [Dependencies - AsmJit]
#include "core/build.h"
@@ -33,6 +31,3 @@
#include "core/virtualmemory.h"
#include "core/zonememory.h"
-// [Guard]
-#endif // _ASMJIT_CORE_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/assembler.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/assembler.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_ASSEMBLER_H
-#define _ASMJIT_CORE_ASSEMBLER_H
+#pragma once
#include <vector>
@@ -460,6 +458,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_ASSEMBLER_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/assert.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/assert.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_ASSERT_H
-#define _ASMJIT_CORE_ASSERT_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/build.h"
@@ -64,6 +62,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_ASSERT_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/buffer.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/buffer.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_BUFFER_H
-#define _ASMJIT_CORE_BUFFER_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/assert.h"
@@ -335,5 +333,3 @@
// [Api-End]
#include "../core/apiend.h"
-#endif // _ASMJIT_CORE_BUFFER_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/build.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/build.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_BUILD_H
-#define _ASMJIT_CORE_BUILD_H
+#pragma once
// [Include]
#include "../Config.h"
@@ -227,6 +225,3 @@
# include "windowsh_wrapper.h"
#endif // ASMJIT_WINDOWS
-// [Guard]
-#endif // _ASMJIT_CORE_BUILD_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/compiler.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/compiler.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_COMPILER_H
-#define _ASMJIT_CORE_COMPILER_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/assembler.h"
@@ -333,6 +331,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_COMPILER_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/compilercontext.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/compilercontext.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_COMPILERCONTEXT_H
-#define _ASMJIT_CORE_COMPILERCONTEXT_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/compiler.h"
@@ -83,6 +81,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_COMPILERCONTEXT_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/compilerfunc.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/compilerfunc.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_COMPILERFUNC_H
-#define _ASMJIT_CORE_COMPILERFUNC_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/compiler.h"
@@ -322,6 +320,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_COMPILERFUNC_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/compileritem.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/compileritem.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_COMPILERITEM_H
-#define _ASMJIT_CORE_COMPILERITEM_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/compiler.h"
@@ -513,6 +511,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_COMPILERITEM_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/context.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/context.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_CONTEXT_H
-#define _ASMJIT_CORE_CONTEXT_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/build.h"
@@ -136,6 +134,3 @@
} // AsmJit namespace
-// [Guard]
-#endif // _ASMJIT_CORE_CONTEXT_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/cpuinfo.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/cpuinfo.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_CPUINFO_H
-#define _ASMJIT_CORE_CPUINFO_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/build.h"
@@ -107,6 +105,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_CPUINFO_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/defs.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/defs.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_DEFS_H
-#define _ASMJIT_CORE_DEFS_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/build.h"
@@ -595,6 +593,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_DEFS_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/func.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/func.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_FUNC_H
-#define _ASMJIT_CORE_FUNC_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/assert.h"
@@ -450,6 +448,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_FUNC_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/intutil.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/intutil.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_INTUTIL_H
-#define _ASMJIT_CORE_INTUTIL_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/assert.h"
@@ -252,6 +250,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_INTUTIL_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/lock.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/lock.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_LOCK_H
-#define _ASMJIT_CORE_LOCK_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/build.h"
@@ -132,6 +130,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_LOCK_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/logger.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/logger.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_LOGGER_H
-#define _ASMJIT_CORE_LOGGER_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/build.h"
@@ -241,6 +239,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_LOGGER_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/memorymanager.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/memorymanager.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_MEMORYMANAGER_H
-#define _ASMJIT_CORE_MEMORYMANAGER_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/build.h"
@@ -169,6 +167,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_MEMORYMANAGER_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/memorymarker.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/memorymarker.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_MEMORYMARKER_H
-#define _ASMJIT_CORE_MEMORYMARKER_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/build.h"
@@ -51,6 +49,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_MEMORYMARKER_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/operand.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/operand.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_OPERAND_H
-#define _ASMJIT_CORE_OPERAND_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/defs.h"
@@ -522,6 +520,3 @@
} // AsmJit namespace
-// [Guard]
-#endif // _ASMJIT_CORE_OPERAND_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/podvector.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/podvector.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_PODVECTOR_H
-#define _ASMJIT_CORE_PODVECTOR_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/assert.h"
@@ -221,5 +219,3 @@
} // AsmJit namespace
-#endif // _ASMJIT_CORE_PODVECTOR_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/stringbuilder.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/stringbuilder.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_STRINGBUILDER_H
-#define _ASMJIT_CORE_STRINGBUILDER_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/assert.h"
@@ -180,5 +178,3 @@
} // AsmJit namespace
-#endif // _ASMJIT_CORE_STRINGBUILDER_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/stringutil.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/stringutil.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_STRINGUTIL_H
-#define _ASMJIT_CORE_STRINGUTIL_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/defs.h"
@@ -42,5 +40,3 @@
} // AsmJit namespace
-#endif // _ASMJIT_CORE_STRINGUTIL_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/virtualmemory.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/virtualmemory.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_VIRTUALMEMORY_H
-#define _ASMJIT_CORE_VIRTUALMEMORY_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/build.h"
@@ -77,6 +75,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_CORE_VIRTUALMEMORY_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/core/zonememory.h
+++ b/src/in_2sf/desmume/utils/AsmJit/core/zonememory.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_CORE_ZONEMEMORY_H
-#define _ASMJIT_CORE_ZONEMEMORY_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/build.h"
@@ -149,5 +147,3 @@
} // AsmJit namespace
-#endif // _ASMJIT_CORE_ZONEMEMORY_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/x86.h
+++ b/src/in_2sf/desmume/utils/AsmJit/x86.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_X86_H
-#define _ASMJIT_X86_H
+#pragma once
// [Dependencies - AsmJit]
#include "core.h"
@@ -22,6 +20,3 @@
#include "x86/x86operand.h"
#include "x86/x86util.h"
-// [Guard]
-#endif // _ASMJIT_X86_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/x86/x86assembler.h
+++ b/src/in_2sf/desmume/utils/AsmJit/x86/x86assembler.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_X86_X86ASSEMBLER_H
-#define _ASMJIT_X86_X86ASSEMBLER_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/assembler.h"
@@ -5439,6 +5437,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_X86_X86ASSEMBLER_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/x86/x86compiler.h
+++ b/src/in_2sf/desmume/utils/AsmJit/x86/x86compiler.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_X86_X86COMPILER_H
-#define _ASMJIT_X86_X86COMPILER_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/build.h"
@@ -4895,6 +4893,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_X86_X86COMPILER_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/x86/x86compilercontext.h
+++ b/src/in_2sf/desmume/utils/AsmJit/x86/x86compilercontext.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_X86_X86COMPILERCONTEXT_H
-#define _ASMJIT_X86_X86COMPILERCONTEXT_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/intutil.h"
@@ -309,6 +307,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_X86_X86COMPILERCONTEXT_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/x86/x86compilerfunc.h
+++ b/src/in_2sf/desmume/utils/AsmJit/x86/x86compilerfunc.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_X86_X86COMPILERFUNC_H
-#define _ASMJIT_X86_X86COMPILERFUNC_H
+#pragma once
// [Dependencies - AsmJit]
#include "../x86/x86assembler.h"
@@ -365,6 +363,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_X86_X86COMPILERFUNC_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/x86/x86compileritem.h
+++ b/src/in_2sf/desmume/utils/AsmJit/x86/x86compileritem.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_X86_X86COMPILERITEM_H
-#define _ASMJIT_X86_X86COMPILERITEM_H
+#pragma once
// [Dependencies - AsmJit]
#include "../x86/x86assembler.h"
@@ -280,6 +278,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_X86_X86COMPILERITEM_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/x86/x86cpuinfo.h
+++ b/src/in_2sf/desmume/utils/AsmJit/x86/x86cpuinfo.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_X86_X86CPUINFO_H
-#define _ASMJIT_X86_X86CPUINFO_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/cpuinfo.h"
@@ -126,6 +124,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_X86_X86CPUINFO_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/x86/x86defs.h
+++ b/src/in_2sf/desmume/utils/AsmJit/x86/x86defs.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_X86_X86DEFS_H
-#define _ASMJIT_X86_X86DEFS_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/assert.h"
@@ -2199,6 +2197,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_X86_X86DEFS_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/x86/x86func.h
+++ b/src/in_2sf/desmume/utils/AsmJit/x86/x86func.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_X86_X86FUNC_H
-#define _ASMJIT_X86_X86FUNC_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/defs.h"
@@ -237,6 +235,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_X86_X86FUNC_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/x86/x86operand.h
+++ b/src/in_2sf/desmume/utils/AsmJit/x86/x86operand.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_X86_X86OPERAND_H
-#define _ASMJIT_X86_X86OPERAND_H
+#pragma once
// [Dependencies - AsmJit]
#include "../core/defs.h"
@@ -1775,6 +1773,3 @@
} // AsmJit namespace
-// [Guard]
-#endif // _ASMJIT_X86_X86OPERAND_H
-
--- a/src/in_2sf/desmume/utils/AsmJit/x86/x86util.h
+++ b/src/in_2sf/desmume/utils/AsmJit/x86/x86util.h
@@ -4,9 +4,7 @@
// [License]
// Zlib - See COPYING file in this package.
-// [Guard]
-#ifndef _ASMJIT_X86_X86UTIL_H
-#define _ASMJIT_X86_X86UTIL_H
+#pragma once
// [Dependencies - AsmJit]
#include "../x86/x86defs.h"
@@ -119,6 +117,3 @@
// [Api-End]
#include "../core/apiend.h"
-// [Guard]
-#endif // _ASMJIT_X86_X86UTIL_H
-
--- a/src/in_2sf/desmume/utils/xstring.h
+++ b/src/in_2sf/desmume/utils/xstring.h
@@ -18,13 +18,10 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _STRINGUTIL_H_
-#define _STRINGUTIL_H_
+#pragma once
#include <string>
#include <vector>
std::vector<std::string> tokenize_str(const std::string &str, const std::string &delims);
-#endif
-
--- a/src/in_2sf/desmume/version.h
+++ b/src/in_2sf/desmume/version.h
@@ -15,11 +15,8 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef VERSION_H
-#define VERSION_H
+#pragma once
const char *EMU_DESMUME_VERSION_STRING();
const char *EMU_DESMUME_NAME_AND_VERSION();
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/Channel.h
+++ b/src/in_ncsf/SSEQPlayer/Channel.h
@@ -1,7 +1,7 @@
/*
* SSEQ Player - Channel structures
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-05-07
+ * Last modification on 2014-09-08
*
* Adapted from source code of FeOS Sound System
* By fincs
@@ -11,8 +11,7 @@
* http://desmume.org/
*/
-#ifndef SSEQPLAYER_CHANNEL_H
-#define SSEQPLAYER_CHANNEL_H
+#pragma once
#include <bitset>
#include <cstdint>
@@ -241,5 +240,3 @@
void IncrementSample();
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/FATSection.h
+++ b/src/in_ncsf/SSEQPlayer/FATSection.h
@@ -1,14 +1,13 @@
/*
* SSEQ Player - SDAT FAT (File Allocation Table) Section structures
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-21
+ * Last modification on 2014-09-08
*
* Nintendo DS Nitro Composer (SDAT) Specification document found at
* http://www.feshrine.net/hacking/doc/nds-sdat.html
*/
-#ifndef SSEQPLAYER_FATSECTION_H
-#define SSEQPLAYER_FATSECTION_H
+#pragma once
#include "common.h"
@@ -30,5 +29,3 @@
void Read(PseudoFile &file);
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/INFOEntry.h
+++ b/src/in_ncsf/SSEQPlayer/INFOEntry.h
@@ -1,14 +1,13 @@
/*
* SSEQ Player - SDAT INFO Entry structures
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-21
+ * Last modification on 2014-09-08
*
* Nintendo DS Nitro Composer (SDAT) Specification document found at
* http://www.feshrine.net/hacking/doc/nds-sdat.html
*/
-#ifndef SSEQPLAYER_INFOENTRY_H
-#define SSEQPLAYER_INFOENTRY_H
+#pragma once
#include "common.h"
@@ -51,5 +50,3 @@
void Read(PseudoFile &file);
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/INFOSection.h
+++ b/src/in_ncsf/SSEQPlayer/INFOSection.h
@@ -1,14 +1,13 @@
/*
* SSEQ Player - SDAT INFO Section structures
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-21
+ * Last modification on 2014-09-08
*
* Nintendo DS Nitro Composer (SDAT) Specification document found at
* http://www.feshrine.net/hacking/doc/nds-sdat.html
*/
-#ifndef SSEQPLAYER_INFOSECTION_H
-#define SSEQPLAYER_INFOSECTION_H
+#pragma once
#include <map>
#include "INFOEntry.h"
@@ -34,5 +33,3 @@
void Read(PseudoFile &file);
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/NDSStdHeader.h
+++ b/src/in_ncsf/SSEQPlayer/NDSStdHeader.h
@@ -1,14 +1,13 @@
/*
* SSEQ Player - Nintendo DS Standard Header structure
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-21
+ * Last modification on 2014-09-08
*
* Nintendo DS Nitro Composer (SDAT) Specification document found at
* http://www.feshrine.net/hacking/doc/nds-sdat.html
*/
-#ifndef SSEQPLAYER_NDSSTDHEADER_H
-#define SSEQPLAYER_NDSSTDHEADER_H
+#pragma once
#include "common.h"
@@ -23,5 +22,3 @@
void Verify(const std::string &typeToCheck, uint32_t magicToCheck);
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/Player.h
+++ b/src/in_ncsf/SSEQPlayer/Player.h
@@ -1,15 +1,14 @@
/*
* SSEQ Player - Player structure
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-01
+ * Last modification on 2014-09-08
*
* Adapted from source code of FeOS Sound System
* By fincs
* https://github.com/fincs/FSS
*/
-#ifndef SSEQPLAYER_PLAYER_H
-#define SSEQPLAYER_PLAYER_H
+#pragma once
#include "SSEQ.h"
#include "Track.h"
@@ -44,5 +43,3 @@
void Timer();
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/SBNK.h
+++ b/src/in_ncsf/SSEQPlayer/SBNK.h
@@ -1,14 +1,13 @@
/*
* SSEQ Player - SDAT SBNK (Sound Bank) structures
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-21
+ * Last modification on 2014-09-08
*
* Nintendo DS Nitro Composer (SDAT) Specification document found at
* http://www.feshrine.net/hacking/doc/nds-sdat.html
*/
-#ifndef SSEQPLAYER_SBNK_H
-#define SSEQPLAYER_SBNK_H
+#pragma once
#include "SWAR.h"
#include "INFOEntry.h"
@@ -58,5 +57,3 @@
void Read(PseudoFile &file);
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/SDAT.h
+++ b/src/in_ncsf/SSEQPlayer/SDAT.h
@@ -1,14 +1,13 @@
/*
* SSEQ Player - SDAT structure
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-30
+ * Last modification on 2014-09-08
*
* Nintendo DS Nitro Composer (SDAT) Specification document found at
* http://www.feshrine.net/hacking/doc/nds-sdat.html
*/
-#ifndef SSEQPLAYER_SDAT_H
-#define SSEQPLAYER_SDAT_H
+#pragma once
#include <memory>
#include "SSEQ.h"
@@ -28,5 +27,3 @@
SDAT &operator=(const SDAT &);
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/SSEQ.h
+++ b/src/in_ncsf/SSEQPlayer/SSEQ.h
@@ -1,14 +1,13 @@
/*
* SSEQ Player - SDAT SSEQ (Sequence) structure
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-21
+ * Last modification on 2014-09-08
*
* Nintendo DS Nitro Composer (SDAT) Specification document found at
* http://www.feshrine.net/hacking/doc/nds-sdat.html
*/
-#ifndef SSEQPLAYER_SSEQ_H
-#define SSEQPLAYER_SSEQ_H
+#pragma once
#include "SBNK.h"
#include "INFOEntry.h"
@@ -29,5 +28,3 @@
void Read(PseudoFile &file);
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/SWAR.h
+++ b/src/in_ncsf/SSEQPlayer/SWAR.h
@@ -1,14 +1,13 @@
/*
* SSEQ Player - SDAT SWAR (Wave Archive) structures
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-21
+ * Last modification on 2014-09-08
*
* Nintendo DS Nitro Composer (SDAT) Specification document found at
* http://www.feshrine.net/hacking/doc/nds-sdat.html
*/
-#ifndef SSEQPLAYER_SWAR_H
-#define SSEQPLAYER_SWAR_H
+#pragma once
#include <map>
#include "SWAV.h"
@@ -30,5 +29,3 @@
void Read(PseudoFile &file);
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/SWAV.h
+++ b/src/in_ncsf/SSEQPlayer/SWAV.h
@@ -1,14 +1,13 @@
/*
* SSEQ Player - SDAT SWAV (Waveform/Sample) structure
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-10
+ * Last modification on 2014-09-08
*
* Nintendo DS Nitro Composer (SDAT) Specification document found at
* http://www.feshrine.net/hacking/doc/nds-sdat.html
*/
-#ifndef SSEQPLAYER_SWAV_H
-#define SSEQPLAYER_SWAV_H
+#pragma once
#include "common.h"
@@ -29,5 +28,3 @@
void DecodeADPCM(const uint8_t *origData, uint32_t len);
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/SYMBSection.h
+++ b/src/in_ncsf/SSEQPlayer/SYMBSection.h
@@ -1,14 +1,13 @@
/*
* SSEQ Player - SDAT SYMB (Symbol/Filename) Section structures
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-21
+ * Last modification on 2014-09-08
*
* Nintendo DS Nitro Composer (SDAT) Specification document found at
* http://www.feshrine.net/hacking/doc/nds-sdat.html
*/
-#ifndef SSEQPLAYER_SYMBSECTION_H
-#define SSEQPLAYER_SYMBSECTION_H
+#pragma once
#include <map>
#include "common.h"
@@ -36,5 +35,3 @@
void Read(PseudoFile &file);
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/Track.h
+++ b/src/in_ncsf/SSEQPlayer/Track.h
@@ -1,15 +1,14 @@
/*
* SSEQ Player - Track structure
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-01
+ * Last modification on 2014-09-08
*
* Adapted from source code of FeOS Sound System
* By fincs
* https://github.com/fincs/FSS
*/
-#ifndef SSEQPLAYER_TRACK_H
-#define SSEQPLAYER_TRACK_H
+#pragma once
#include <bitset>
#include "consts.h"
@@ -59,5 +58,3 @@
void Run();
};
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/common.h
+++ b/src/in_ncsf/SSEQPlayer/common.h
@@ -1,15 +1,14 @@
/*
* SSEQ Player - Common functions
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-05-01
+ * Last modification on 2014-09-08
*
* Some code from FeOS Sound System
* By fincs
* https://github.com/fincs/FSS
*/
-#ifndef SSEQPLAYER_COMMON_H
-#define SSEQPLAYER_COMMON_H
+#pragma once
#include <string>
#include <vector>
@@ -244,5 +243,3 @@
return x;
}
-#endif
-
--- a/src/in_ncsf/SSEQPlayer/consts.h
+++ b/src/in_ncsf/SSEQPlayer/consts.h
@@ -1,7 +1,7 @@
/*
* SSEQ Player - Constants/Macros
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-05-07
+ * Last modification on 2014-09-08
*
* Adapted from source code of FeOS Sound System
* By fincs
@@ -11,8 +11,7 @@
* http://devkitpro.org/
*/
-#ifndef SSEQPLAYER_CONSTS_H
-#define SSEQPLAYER_CONSTS_H
+#pragma once
#include <cstdint>
@@ -62,5 +61,3 @@
INTERPOLATION_SINC
};
-#endif
-
--- a/src/in_ncsf/XSFPlayer_NCSF.h
+++ b/src/in_ncsf/XSFPlayer_NCSF.h
@@ -1,7 +1,7 @@
/*
* xSF - NCSF Player
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-01
+ * Last modification on 2014-09-08
*
* Partially based on the vio*sf framework
*
@@ -9,8 +9,7 @@
* https://github.com/fincs/FSS
*/
-#ifndef XSFPLAYER_NCSF_H
-#define XSFPLAYER_NCSF_H
+#pragma once
#include <memory>
#include <bitset>
@@ -43,5 +42,3 @@
void SetMutes(const std::bitset<16> &newMutes);
};
-#endif
-
--- a/src/in_snsf/XSFConfig_SNSF.h
+++ b/src/in_snsf/XSFConfig_SNSF.h
@@ -1,7 +1,7 @@
/*
* xSF - SNSF configuration
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-21
+ * Last modification on 2014-09-08
*
* Partially based on the vio*sf framework
*
@@ -10,8 +10,7 @@
* snes9x.
*/
-#ifndef XSFCONFIG_SNSF_H
-#define XSFCONFIG_SNSF_H
+#pragma once
#include <bitset>
#include "XSFPlayer.h"
@@ -42,5 +41,3 @@
void About(HWND parent);
};
-#endif
-
--- a/src/in_snsf/snes9x/65c816.h
+++ b/src/in_snsf/snes9x/65c816.h
@@ -175,8 +175,7 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-#ifndef _65C816_H_
-#define _65C816_H_
+#pragma once
const uint16_t Carry = 1;
const uint16_t Zero = 2;
@@ -246,5 +245,3 @@
inline void ClearFlags(uint16_t f) { Registers.P.W &= ~f; }
inline bool CheckFlag(uint16_t f) { return !!(Registers.P.W & f); }
-#endif
-
--- a/src/in_snsf/snes9x/cpuaddr.h
+++ b/src/in_snsf/snes9x/cpuaddr.h
@@ -175,8 +175,7 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-#ifndef _CPUADDR_H_
-#define _CPUADDR_H_
+#pragma once
enum AccessMode
{
@@ -703,5 +702,3 @@
return StackRelativeIndirectIndexedWrapper(StackRelative, a);
}
-#endif
-
--- a/src/in_snsf/snes9x/cpuexec.h
+++ b/src/in_snsf/snes9x/cpuexec.h
@@ -175,8 +175,7 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-#ifndef _CPUEXEC_H_
-#define _CPUEXEC_H_
+#pragma once
#include "ppu.h"
@@ -298,5 +297,3 @@
CPU.IRQLastState = thisIRQ;
}
-#endif
-
--- a/src/in_snsf/snes9x/cpumacro.h
+++ b/src/in_snsf/snes9x/cpumacro.h
@@ -175,8 +175,7 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-#ifndef _CPUMACRO_H_
-#define _CPUMACRO_H_
+#pragma once
template<typename Fa, typename Ff> inline void rOP8(Fa addr, Ff func)
{
@@ -880,5 +879,3 @@
OpenBus = Work8;
}
-#endif
-
--- a/src/in_snsf/snes9x/cpuops.h
+++ b/src/in_snsf/snes9x/cpuops.h
@@ -175,12 +175,8 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-
-#ifndef _CPUOPS_H_
-#define _CPUOPS_H_
+#pragma once
void S9xOpcode_NMI();
void S9xOpcode_IRQ();
-#endif
-
--- a/src/in_snsf/snes9x/dma.h
+++ b/src/in_snsf/snes9x/dma.h
@@ -175,8 +175,7 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-#ifndef _DMA_H_
-#define _DMA_H_
+#pragma once
struct SDMA
{
@@ -205,5 +204,3 @@
uint8_t S9xDoHDMA(uint8_t);
void S9xResetDMA();
-#endif
-
--- a/src/in_snsf/snes9x/getset.h
+++ b/src/in_snsf/snes9x/getset.h
@@ -175,8 +175,7 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-#ifndef _GETSET_H_
-#define _GETSET_H_
+#pragma once
#include "cpuexec.h"
@@ -642,5 +641,3 @@
}
}
-#endif
-
--- a/src/in_snsf/snes9x/memmap.h
+++ b/src/in_snsf/snes9x/memmap.h
@@ -175,8 +175,7 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-#ifndef _MEMMAP_H_
-#define _MEMMAP_H_
+#pragma once
#include <memory>
#include <cstdint>
@@ -297,5 +296,3 @@
#include "getset.h"
-#endif
-
--- a/src/in_snsf/snes9x/port.h
+++ b/src/in_snsf/snes9x/port.h
@@ -175,8 +175,7 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-#ifndef _PORT_H_
-#define _PORT_H_
+#pragma once
#include <cstdio>
#include <cstdlib>
@@ -217,14 +216,12 @@
#endif
#ifdef FAST_LSB_WORD_ACCESS
-inline uint16_t READ_WORD(uint8_t *s) { return *reinterpret_cast<uint16_t *>(s); }
-inline uint32_t READ_3WORD(uint8_t *s) { return *reinterpret_cast<uint32_t *>(s) & 0x00FFFFFF; }
+inline uint16_t READ_WORD(const uint8_t *s) { return *reinterpret_cast<const uint16_t *>(s); }
+inline uint32_t READ_3WORD(const uint8_t *s) { return *reinterpret_cast<const uint32_t *>(s) & 0x00FFFFFF; }
inline void WRITE_WORD(uint8_t *s, uint16_t d) { *reinterpret_cast<uint16_t *>(s) = d; }
#else
-inline uint16_t READ_WORD(uint8_t *s) { return s | ((s + 1) << 8); }
-inline uint32-t READ_3WORD(uint8_t *s) { return s | ((s + 1) << 8) | ((s + 2) << 16); }
+inline uint16_t READ_WORD(const uint8_t *s) { return s | ((s + 1) << 8); }
+inline uint32-t READ_3WORD(const uint8_t *s) { return s | ((s + 1) << 8) | ((s + 2) << 16); }
inline void WRITE_WORD(uint8_t *s, uint16_t d) { *s = static_cast<uint8_t>(d); *(s + 1) = static_cast<uint8_t>(d >> 8); }
#endif
-#endif
-
--- a/src/in_snsf/snes9x/ppu.h
+++ b/src/in_snsf/snes9x/ppu.h
@@ -175,8 +175,7 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-#ifndef _PPU_H_
-#define _PPU_H_
+#pragma once
const int32_t FIRST_VISIBLE_LINE = 1;
@@ -443,5 +442,3 @@
return byte;
}
-#endif
-
--- a/src/in_snsf/snes9x/sdd1.h
+++ b/src/in_snsf/snes9x/sdd1.h
@@ -175,11 +175,8 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-#ifndef _SDD1_H_
-#define _SDD1_H_
+#pragma once
void S9xSetSDD1MemoryMap(uint32_t, uint32_t);
void S9xResetSDD1();
-#endif
-
--- a/src/in_snsf/snes9x/snes9x.h
+++ b/src/in_snsf/snes9x/snes9x.h
@@ -175,8 +175,7 @@
Nintendo Co., Limited and its subsidiary companies.
***********************************************************************************/
-#ifndef _SNES9X_H_
-#define _SNES9X_H_
+#pragma once
#ifndef VERSION
#define VERSION "1.53"
@@ -307,5 +306,3 @@
extern STimings Timings;
extern SSNESGameFixes SNESGameFixes;
-#endif
-
--- a/src/in_xsf_framework/BigSString.h
+++ b/src/in_xsf_framework/BigSString.h
@@ -1,11 +1,10 @@
/*
* String class in ANSI (or rather, current Windows code page), UTF-8, and UTF-16
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-25
+ * Last modification on 2014-09-08
*/
-#ifndef BIGSSTRING_H
-#define BIGSSTRING_H
+#pragma once
#include <string>
#include <cstring>
@@ -217,5 +216,3 @@
std::locale loc;
};
-#endif
-
--- a/src/in_xsf_framework/ConvertUTF.h
+++ b/src/in_xsf_framework/ConvertUTF.h
@@ -79,8 +79,7 @@
------------------------------------------------------------------------ */
-#ifndef _CONVERTUTF_H_
-#define _CONVERTUTF_H_
+#pragma once
/* ---------------------------------------------------------------------
The following 4 definitions are compiler-specific.
@@ -131,5 +130,3 @@
/* --------------------------------------------------------------------- */
-#endif
-
--- a/src/in_xsf_framework/DialogBuilder.h
+++ b/src/in_xsf_framework/DialogBuilder.h
@@ -1,11 +1,10 @@
/*
* Windows Dynamic Dialog Builder framework
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-23
+ * Last modification on 2014-09-08
*/
-#ifndef DIALOG_BUILDER_H
-#define DIALOG_BUILDER_H
+#pragma once
#include <string>
#include <memory>
@@ -674,5 +673,3 @@
const DLGTEMPLATE *GenerateTemplate();
};
-#endif
-
--- a/src/in_xsf_framework/TagList.h
+++ b/src/in_xsf_framework/TagList.h
@@ -1,14 +1,13 @@
/*
* xSF Tag List
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-03-21
+ * Last modification on 2014-09-08
*
* Storage of tags from PSF-style files, specifications found at
* http://wiki.neillcorlett.com/PSFTagFormat
*/
-#ifndef TAGLIST_H
-#define TAGLIST_H
+#pragma once
#include <map>
#include <vector>
@@ -36,5 +35,3 @@
void Clear();
};
-#endif
-
--- a/src/in_xsf_framework/UTFEncodeDecode.h
+++ b/src/in_xsf_framework/UTFEncodeDecode.h
@@ -1,8 +1,7 @@
// original code is from here: http://www.codeproject.com/Tips/197097/Converting-ANSI-to-Unicode-and-back
// License: The Code Project Open License (CPOL) http://www.codeproject.com/info/cpol10.aspx
-#ifndef UTFENCODEDECODE_H
-#define UTFENCODEDECODE_H
+#pragma once
#include <string>
#include <locale>
@@ -60,5 +59,3 @@
}
};
-#endif
-
--- a/src/in_xsf_framework/UtfConverter.h
+++ b/src/in_xsf_framework/UtfConverter.h
@@ -1,8 +1,7 @@
// original code is from here: http://www.codeproject.com/Articles/17573/Convert-Between-std-string-and-std-wstring-UTF-8-a
// License: The Code Project Open License (CPOL) http://www.codeproject.com/info/cpol10.aspx
-#ifndef UTFCONVERTER_H
-#define UTFCONVERTER_H
+#pragma once
#include <string>
@@ -12,5 +11,3 @@
std::string ToUtf8(const std::wstring &);
}
-#endif
-
--- a/src/in_xsf_framework/XSFCommon.h
+++ b/src/in_xsf_framework/XSFCommon.h
@@ -1,13 +1,12 @@
/*
* xSF - Common functions
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-26
+ * Last modification on 2014-09-08
*
* Partially based on the vio*sf framework
*/
-#ifndef XSFCOMMON_H
-#define XSFCOMMON_H
+#pragma once
#include <limits>
#include <fstream>
@@ -89,5 +88,3 @@
}
#endif
-#endif
-
--- a/src/in_xsf_framework/XSFConfig.h
+++ b/src/in_xsf_framework/XSFConfig.h
@@ -1,13 +1,12 @@
/*
* xSF - Core configuration handler
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-02
+ * Last modification on 2014-09-08
*
* Partially based on the vio*sf framework
*/
-#ifndef XSFCONFIG_H
-#define XSFCONFIG_H
+#pragma once
#include <memory>
#include "XSFPlayer.h"
@@ -96,5 +95,3 @@
const std::wstring &GetTitleFormat() const;
};
-#endif
-
--- a/src/in_xsf_framework/XSFFile.h
+++ b/src/in_xsf_framework/XSFFile.h
@@ -1,13 +1,12 @@
/*
* xSF - File structure
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-23
+ * Last modification on 2014-09-08
*
* Partially based on the vio*sf framework
*/
-#ifndef XSFFILE_H
-#define XSFFILE_H
+#pragma once
#include <cstdint>
#include "TagList.h"
@@ -75,5 +74,3 @@
void SaveFile() const;
};
-#endif
-
--- a/src/in_xsf_framework/XSFPlayer.h
+++ b/src/in_xsf_framework/XSFPlayer.h
@@ -1,13 +1,12 @@
/*
* xSF - Core Player
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-05-07
+ * Last modification on 2014-09-08
*
* Partially based on the vio*sf framework
*/
-#ifndef XSFPLAYER_H
-#define XSFPLAYER_H
+#pragma once
#include "XSFFile.h"
@@ -57,5 +56,3 @@
virtual void Terminate() = 0;
};
-#endif
-
--- a/src/in_xsf_framework/convert.h
+++ b/src/in_xsf_framework/convert.h
@@ -1,11 +1,10 @@
/*
* Common conversion functions
* By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
- * Last modification on 2013-04-23
+ * Last modification on 2014-09-08
*/
-#ifndef _CONVERT_H_
-#define _CONVERT_H_
+#pragma once
#include <stdexcept>
#include <string>
@@ -153,5 +152,3 @@
}
};
-#endif
-
--- a/src/in_xsf_framework/eqstr.h
+++ b/src/in_xsf_framework/eqstr.h
@@ -1,14 +1,13 @@
/*
* Case-insensitive string equality
- * Last modification on 2013-03-30
+ * Last modification on 2014-09-08
*
* Based on "How to do case-insensitive string comparison"
* By Matt Austern
* http://lafstern.org/matt/col2_new.pdf
*/
-#ifndef EQSTR_H
-#define EQSTR_H
+#pragma once
#include <functional>
#include <locale>
@@ -40,5 +39,3 @@
}
};
-#endif
-
--- a/src/in_xsf_framework/ltstr.h
+++ b/src/in_xsf_framework/ltstr.h
@@ -1,14 +1,13 @@
/*
* Case-insensitive string comparison
- * Last modification on 2012-03-30
+ * Last modification on 2014-09-08
*
* Based on "How to do case-insensitive string comparison"
* By Matt Austern
* http://lafstern.org/matt/col2_new.pdf
*/
-#ifndef LTSTR_H
-#define LTSTR_H
+#pragma once
#include <functional>
#include <locale>
@@ -40,5 +39,3 @@
}
};
-#endif
-
--- a/src/in_xsf_framework/windowsh_wrapper.h
+++ b/src/in_xsf_framework/windowsh_wrapper.h
@@ -3,8 +3,7 @@
* http://learnwinapi.wordpress.com/2011/12/13/lesson-2-the-api-is-based-on-unicode/
*/
-#ifndef WINDOWSH_WRAPPER_H
-#define WINDOWSH_WRAPPER_H
+#pragma once
#ifdef _MBCS
# error "_MBCS (multi-byte character set) is defined, but only Unicode is supported"
@@ -30,5 +29,3 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-#endif
-