GCC 4.2 fixes
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@895 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
parent
1cc348d6e2
commit
0c4789ee11
3 changed files with 2364 additions and 2355 deletions
File diff suppressed because it is too large
Load diff
2297
src/LevelMutex.cpp
2297
src/LevelMutex.cpp
File diff suppressed because it is too large
Load diff
|
@ -1,6 +1,6 @@
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
// The Loki Library
|
||||
// Copyright (c) 2006 Peter Kümmel
|
||||
// Copyright (c) 2006 Peter K<EFBFBD>mmel
|
||||
// Permission to use, copy, modify, distribute and sell this software for any
|
||||
// purpose is hereby granted without fee, provided that the above copyright
|
||||
// notice appear in all copies and that both that copyright notice and this
|
||||
|
@ -200,7 +200,13 @@ void User::AddFriendGuardedMacros(User&)
|
|||
&User::CheckIfValid, __FUNCTION__, __LINE__ );
|
||||
(void)invariantGuard;
|
||||
LOKI_ON_BLOCK_EXIT_OBJ(friends_, &UserCont::pop_back); (void) LOKI_ANONYMOUS_VARIABLE(scopeGuard);
|
||||
// GCC 4.2 Bug
|
||||
#if defined(__GNUC__)
|
||||
#define GCC_VERSION (__GNUC__ * 10 + __GNUC_MINOR__ * 1)
|
||||
#endif
|
||||
#if !defined(__GNUC__) || (GCC_VERSION < 42) || (GCC_VERSION > 42)
|
||||
LOKI_ON_BLOCK_EXIT(Decrement, Loki::ByRef(fCount)); (void) LOKI_ANONYMOUS_VARIABLE(scopeGuard);
|
||||
#endif
|
||||
}
|
||||
|
||||
void DoStandaloneFunctionTests()
|
||||
|
|
Loading…
Reference in a new issue