build fixes
This was SVN commit r7300.
This commit is contained in:
parent
10f0432fdf
commit
cc0c3988d1
@ -127,15 +127,12 @@ switch(x % 2)
|
||||
*
|
||||
* @param expression that is expected to evaluate to non-zero at compile-time.
|
||||
**/
|
||||
#define cassert(expr) typedef detail::static_assert_<(expr)>::type UID__
|
||||
namespace detail
|
||||
#define cassert(expr) typedef static_assert_<(expr)>::type UID__
|
||||
template<bool> struct static_assert_;
|
||||
template<> struct static_assert_<true>
|
||||
{
|
||||
template<bool> struct static_assert_;
|
||||
template<> struct static_assert_<true>
|
||||
{
|
||||
typedef int type;
|
||||
};
|
||||
}
|
||||
typedef int type;
|
||||
};
|
||||
|
||||
/**
|
||||
* compile-time debug_assert. causes a compile error if the expression
|
||||
|
@ -294,7 +294,7 @@ LIB_API TimerClient* timer_AddClient(TimerClient* tc, const wchar_t* description
|
||||
**/
|
||||
#define TIMER_ADD_CLIENT(id)\
|
||||
static TimerClient UID__;\
|
||||
static TimerClient* id = timer_AddClient(&UID__, WIDEN(#id));
|
||||
static TimerClient* id = timer_AddClient(&UID__, WIDEN(#id))
|
||||
|
||||
/**
|
||||
* bill the difference between t0 and t1 to the client's total.
|
||||
@ -339,7 +339,7 @@ private:
|
||||
* a string literal is safest.
|
||||
*
|
||||
* Example usage:
|
||||
* TIMER_ADD_CLIENT(identifier)
|
||||
* TIMER_ADD_CLIENT(identifier);
|
||||
*
|
||||
* void func()
|
||||
* {
|
||||
|
Loading…
Reference in New Issue
Block a user