mirror of
https://github.com/id-Software/DOOM-3-BFG.git
synced 2025-04-22 09:40:46 +00:00
Applied new AStyle settings
This commit is contained in:
parent
08cb9730e3
commit
527b1fbfd5
4 changed files with 10 additions and 10 deletions
|
@ -601,7 +601,7 @@ ID_INLINE bool idStaticList<type, size>::RemoveIndex( int index )
|
|||
num--;
|
||||
for( i = index; i < num; i++ )
|
||||
{
|
||||
list[ i ] = std::move(list[ i + 1 ]);
|
||||
list[ i ] = std::move( list[ i + 1 ] );
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
|
@ -47,7 +47,7 @@ typedef uint32 dword;
|
|||
// macros required by gimp-dds code:
|
||||
#ifndef MIN
|
||||
#ifdef __GNUC__
|
||||
# define MIN(a, b) ({decltype(a) _a=(a); decltype(b) _b=(b); _a < _b ? _a : _b;})
|
||||
#define MIN(a, b) ({decltype(a) _a=(a); decltype(b) _b=(b); _a < _b ? _a : _b;})
|
||||
#else
|
||||
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
||||
#endif
|
||||
|
|
|
@ -47,12 +47,12 @@ public:
|
|||
|
||||
idLocalUserWin() : inputDevice( 0 ) {}
|
||||
|
||||
idLocalUserWin& operator=(idLocalUserWin&& other)
|
||||
{
|
||||
gamertag = std::move(other.gamertag);
|
||||
inputDevice = other.inputDevice;
|
||||
return *this;
|
||||
}
|
||||
idLocalUserWin& operator=( idLocalUserWin&& other )
|
||||
{
|
||||
gamertag = std::move( other.gamertag );
|
||||
inputDevice = other.inputDevice;
|
||||
return *this;
|
||||
}
|
||||
|
||||
//==========================================================================================
|
||||
// idLocalUser interface
|
||||
|
|
|
@ -48,8 +48,8 @@ public:
|
|||
idProfileMgr();
|
||||
~idProfileMgr();
|
||||
|
||||
// Not copyable because we use unique_ptrs.
|
||||
idProfileMgr& operator=(const idProfileMgr&) = delete;
|
||||
// Not copyable because we use unique_ptrs.
|
||||
idProfileMgr& operator=( const idProfileMgr& ) = delete;
|
||||
|
||||
// Called the first time it's asked to load
|
||||
void Init( idLocalUser* user );
|
||||
|
|
Loading…
Reference in a new issue