diff options
| author | Richard Linden <none@none> | 2012-11-15 19:46:09 -0800 | 
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-15 19:46:09 -0800 | 
| commit | c136b432140f892a56d4996d5ed77e903ff0b32d (patch) | |
| tree | e1af9a407b0af582349396d8cb51e2e794260d43 /indra/test | |
| parent | 9d77e030d9a0d23cebce616631677459eec1612c (diff) | |
SH-3406 WIP convert fast timers to lltrace system
eliminated min and max macros from windows.h
got rest of viewer to compile against llfasttimer changes
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/test.cpp | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/indra/test/test.cpp b/indra/test/test.cpp index 2b66c6aa26..8bd302ce7a 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -40,6 +40,7 @@  #include "tests/wrapllerrs.h"             // RecorderProxy  #include "stringize.h"  #include "namedtempfile.h" +#include "lltrace.h"  #include "apr_pools.h"  #include "apr_getopt.h" @@ -513,7 +514,8 @@ int main(int argc, char **argv)  #endif  	ll_init_apr(); - +	LLTrace::init(); +	  	apr_getopt_t* os = NULL;  	if(APR_SUCCESS != apr_getopt_init(&os, gAPRPoolp, argc, argv))  	{ | 
