Replace all include guard ifdefs with "#pragma once"

This commit is contained in:
lioncash
2014-02-10 13:54:46 -05:00
committed by Lioncash
parent a0a65a2906
commit d2038049f5
462 changed files with 676 additions and 2308 deletions

View File

@ -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_

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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_

View File

@ -4,8 +4,7 @@
// Detect the cpu, so we'll know which optimizations to use
#ifndef _CPUDETECT_H_
#define _CPUDETECT_H_
#pragma once
#include <string>
@ -85,5 +84,3 @@ private:
};
extern CPUInfo cpu_info;
#endif // _CPUDETECT_H_

View File

@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _POINTERWRAP_H_
#define _POINTERWRAP_H_
#pragma once
// Extremely simple serialization framework.
@ -431,5 +429,3 @@ private:
u32 ExpectedSize;
};
};
#endif // _POINTERWRAP_H_

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _COLORUTIL_H_
#define _COLORUTIL_H_
#pragma once
namespace ColorUtil
{
@ -12,5 +11,3 @@ void decode5A3image(u32* dst, u16* src, int width, int height);
void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height);
} // namespace
#endif // _COLORUTIL_H_

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _COMMON_H_
#define _COMMON_H_
#pragma once
// DO NOT EVER INCLUDE <windows.h> directly _or indirectly_ from this file
// since it slows down the build a lot.
@ -174,5 +173,3 @@ enum EMUSTATE_CHANGE
};
#include "CommonFuncs.h"
#endif // _COMMON_H_

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _COMMONFUNCS_H_
#define _COMMONFUNCS_H_
#pragma once
#ifdef _WIN32
#define SLEEP(x) Sleep(x)
@ -253,5 +252,3 @@ inline T FromBigEndian(T data)
}
} // Namespace Common
#endif // _COMMONFUNCS_H_

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _COMMON_PATHS_H_
#define _COMMON_PATHS_H_
#pragma once
// Make sure we pick up USER_DIR if set in config.h
#include "Common.h"
@ -119,5 +118,3 @@
// Subdirs in Sys
#define GC_SYS_DIR "GC"
#define WII_SYS_DIR "Wii"
#endif // _COMMON_PATHS_H_

View File

@ -7,8 +7,7 @@
// other parts of the code. Any definitions that are only used by the core should be
// placed in "Common.h" instead.
#ifndef _COMMONTYPES_H_
#define _COMMONTYPES_H_
#pragma once
#include <cstdint>
#include <cstddef>
@ -47,5 +46,3 @@ typedef int64_t s64;
#define LONG int
#endif // _WIN32
#endif // _COMMONTYPES_H_

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _CONSOLELISTENER_H
#define _CONSOLELISTENER_H
#pragma once
#include "LogManager.h"
@ -37,5 +36,3 @@ private:
#endif
bool bUseColor;
};
#endif // _CONSOLELISTENER_H

View File

@ -1,5 +1,4 @@
#ifndef _DEBUGINTERFACE_H
#define _DEBUGINTERFACE_H
#pragma once
#include <string>
@ -34,5 +33,3 @@ public:
virtual int getColor(unsigned int /*address*/){return 0xFFFFFFFF;}
virtual std::string getDescription(unsigned int /*address*/) = 0;
};
#endif

View File

@ -12,8 +12,7 @@
//
// ----------------------------------------------------------------------------------------
#ifndef _EXTENDEDTRACE_H_INCLUDED_
#define _EXTENDEDTRACE_H_INCLUDED_
#pragma once
#if defined(WIN32)
@ -23,9 +22,9 @@
#pragma comment( lib, "imagehlp.lib" )
#define EXTENDEDTRACEINITIALIZE( IniSymbolPath ) InitSymInfo( IniSymbolPath )
#define EXTENDEDTRACEUNINITIALIZE() UninitSymInfo()
#define STACKTRACE(file) StackTrace( GetCurrentThread(), "", file)
#define EXTENDEDTRACEINITIALIZE( IniSymbolPath ) InitSymInfo( IniSymbolPath )
#define EXTENDEDTRACEUNINITIALIZE() UninitSymInfo()
#define STACKTRACE(file) StackTrace( GetCurrentThread(), "", file)
#define STACKTRACE2(file, eip, esp, ebp) StackTrace(GetCurrentThread(), "", file, eip, esp, ebp)
// class File;
@ -40,13 +39,12 @@ void etfprint(FILE *file, const std::string &text);
#define UEFBUFSIZE 2048
extern char g_uefbuf[UEFBUFSIZE];
#else // not WIN32
#else // not WIN32
#define EXTENDEDTRACEINITIALIZE( IniSymbolPath ) ((void)0)
#define EXTENDEDTRACEUNINITIALIZE() ((void)0)
#define STACKTRACE(file) ((void)0)
#define STACKTRACE2(file, eip, esp, ebp) ((void)0)
#define EXTENDEDTRACEINITIALIZE( IniSymbolPath ) ((void)0)
#define EXTENDEDTRACEUNINITIALIZE() ((void)0)
#define STACKTRACE(file) ((void)0)
#define STACKTRACE2(file, eip, esp, ebp) ((void)0)
#endif // WIN32
#endif // WIN32
#endif // _EXTENDEDTRACE_H_INCLUDED_

View File

@ -1,21 +1,9 @@
// Copyright (C) 2003 Dolphin Project.
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
// 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.
#pragma once
// 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/
#ifndef FPU_ROUND_MODE_H_
#define FPU_ROUND_MODE_H_
#include "CommonTypes.h"
namespace FPURoundMode
@ -49,4 +37,3 @@ namespace FPURoundMode
void LoadSIMDState();
void LoadDefaultSIMDState();
}
#endif

View File

@ -1,6 +1,4 @@
#ifndef _FIFO_QUEUE_H_
#define _FIFO_QUEUE_H_
#pragma once
// a simple lockless thread-safe,
// single reader, single writer queue
@ -116,5 +114,3 @@ private:
};
}
#endif

View File

@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _FILESEARCH_H_
#define _FILESEARCH_H_
#pragma once
#include <string>
#include <vector>
@ -24,5 +22,3 @@ private:
XStringVector m_FileNames;
};
#endif // _FILESEARCH_H_

View File

@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _FILEUTIL_H_
#define _FILEUTIL_H_
#pragma once
#include <fstream>
#include <cstdio>
@ -237,5 +235,3 @@ void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmod
fstream.open(filename.c_str(), openmode);
#endif
}
#endif

View File

@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _FIXED_SIZE_QUEUE_H_
#define _FIXED_SIZE_QUEUE_H_
#pragma once
// STL-look-a-like interface, but name is mixed case to distinguish it clearly from the
// real STL classes.
@ -70,6 +68,3 @@ public:
return count;
}
};
#endif // _FIXED_SIZE_QUEUE_H_

View File

@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _HASH_H_
#define _HASH_H_
#pragma once
#include "Common.h"
@ -17,4 +15,3 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples);
u64 GetMurmurHash3(const u8 *src, int len, u32 samples);
u64 GetHash64(const u8 *src, int len, u32 samples);
void SetHash64Function(bool useHiresTextures);
#endif // _HASH_H_

View File

@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _INIFILE_H_
#define _INIFILE_H_
#pragma once
#include <map>
#include <string>
@ -159,5 +157,3 @@ private:
std::string* GetLine(const char* section, const char* key);
void CreateSection(const char* section);
};
#endif // _INIFILE_H_

View File

@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _LINEAR_DISKCACHE
#define _LINEAR_DISKCACHE
#pragma once
#include "Common.h"
#include <fstream>
@ -184,5 +182,3 @@ private:
std::fstream m_file;
u32 m_num_entries;
};
#endif // _LINEAR_DISKCACHE

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _LOG_H_
#define _LOG_H_
#pragma once
#define NOTICE_LEVEL 1 // VERY important information that is NOT errors. Like startup and OSReports.
#define ERROR_LEVEL 2 // Critical errors
@ -155,5 +154,3 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type,
#else // GEKKO
#define _assert_msg_(_t_, _a_, _fmt_, ...)
#endif
#endif // _LOG_H_

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _LOGMANAGER_H_
#define _LOGMANAGER_H_
#pragma once
#include "Log.h"
#include "StringUtil.h"
@ -165,5 +164,3 @@ public:
static void Init();
static void Shutdown();
};
#endif // _LOGMANAGER_H_

View File

@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _MATH_UTIL_H_
#define _MATH_UTIL_H_
#pragma once
#include "Common.h"
@ -206,5 +204,3 @@ public:
float data[16];
};
#endif // _MATH_UTIL_H_

View File

@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _MEMARENA_H_
#define _MEMARENA_H_
#pragma once
#ifdef _WIN32
#include <windows.h>
@ -54,5 +52,3 @@ struct MemoryView
// a passed-in list of MemoryView structures.
u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena *arena);
void MemoryMap_Shutdown(const MemoryView *views, int num_views, u32 flags, MemArena *arena);
#endif // _MEMARENA_H_

View File

@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _MEMORYUTIL_H
#define _MEMORYUTIL_H
#pragma once
#include <string>
@ -22,5 +20,3 @@ void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute = false);
std::string MemUsage();
inline int GetPageSize() { return 4096; }
#endif

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _MSGHANDLER_H_
#define _MSGHANDLER_H_
#pragma once
#include <string>
@ -69,5 +68,3 @@ void SetEnableAlert(bool enable);
#define AskYesNoT(format, ...) ;
#define CriticalAlertT(format, ...) ;
#endif
#endif // _MSGHANDLER_H_

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef __NANDPATHS_H__
#define __NANDPATHS_H__
#pragma once
#include <string>
#include "CommonTypes.h"
@ -23,5 +22,3 @@ namespace Common
bool CheckTitleTIK(u64 _titleID);
void ReadReplacements(replace_v& replacements);
}
#endif

View File

@ -1,19 +1,8 @@
// Copyright (C) 2003 Dolphin Project.
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
// 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 Git repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#pragma once
#include "CommonTypes.h"

View File

@ -1,6 +1,8 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef CONDITION_VARIABLE_H_
#define CONDITION_VARIABLE_H_
#pragma once
#define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z))
#define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
@ -172,4 +174,3 @@ private:
}
#endif
#endif

View File

@ -1,6 +1,8 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef MUTEX_H_
#define MUTEX_H_
#pragma once
#define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z))
#define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
@ -368,4 +370,3 @@ void swap(unique_lock<Mutex>& x, unique_lock<Mutex>& y)
}
#endif
#endif

View File

@ -1,6 +1,8 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef STD_THREAD_H_
#define STD_THREAD_H_
#pragma once
#define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z))
#define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
@ -320,4 +322,3 @@ inline thread::id get_id()
#undef THREAD_HANDLE
#endif
#endif

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _STRINGUTIL_H_
#define _STRINGUTIL_H_
#pragma once
#include <stdarg.h>
@ -114,5 +113,3 @@ inline std::string UTF8ToTStr(const std::string& str)
#endif
#endif
#endif // _STRINGUTIL_H_

View File

@ -5,8 +5,7 @@
// This file contains a generic symbol map implementation. For CPU-specific
// magic, derive and extend.
#ifndef _SYMBOL_DB_H
#define _SYMBOL_DB_H
#pragma once
#include <string>
#include <map>
@ -105,5 +104,3 @@ public:
void List();
void Index();
};
#endif

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef __SYSCONF_MANAGER_h__
#define __SYSCONF_MANAGER_h__
#pragma once
#include <string>
#include <vector>
@ -176,5 +175,3 @@ private:
std::vector<SSysConfEntry> m_Entries;
bool m_IsValid;
};
#endif // __SYSCONF_MANAGER_h__

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _THREAD_H_
#define _THREAD_H_
#pragma once
#include "StdConditionVariable.h"
#include "StdMutex.h"
@ -122,5 +121,3 @@ inline void YieldCPU()
void SetCurrentThreadName(const char *name);
} // namespace Common
#endif // _THREAD_H_

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _TIMER_H_
#define _TIMER_H_
#pragma once
#include "CommonTypes.h"
#include <string>
@ -42,5 +41,3 @@ private:
};
} // Namespace Common
#endif // _TIMER_H_

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _JIT_ABI_H_
#define _JIT_ABI_H_
#pragma once
#include "Common.h"
@ -76,7 +75,3 @@
#endif // WIN32
#endif // X86
#endif // _JIT_ABI_H_

View File

@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#ifndef _X64ANALYZER_H_
#define _X64ANALYZER_H_
#pragma once
#include "CommonTypes.h"
@ -40,5 +39,3 @@ enum AccessType
};
bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info);
#endif // _X64ANALYZER_H_

View File

@ -4,8 +4,7 @@
// WARNING - THIS LIBRARY IS NOT THREAD SAFE!!!
#ifndef _DOLPHIN_INTEL_CODEGEN_
#define _DOLPHIN_INTEL_CODEGEN_
#pragma once
#include "Common.h"
#include "MemoryUtil.h"
@ -774,5 +773,3 @@ public:
};
} // namespace
#endif // _DOLPHIN_INTEL_CODEGEN_