diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:39:08 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:39:08 +0000 |
| commit | 1f27bcfe8a6f7380ef53ca70a51004b4f87fed4b (patch) | |
| tree | cfa068e7493530c6a833dd303b2f034ec33ef6b9 /testtools/source/performance | |
| parent | ffa47d470523287aabc8dbeafaab0164ba104d69 (diff) | |
INTEGRATION: CWS hr33 (1.4.112); FILE MERGED
2006/11/07 12:49:24 hr 1.4.112.3: RESYNC: (1.4-1.6); FILE MERGED
2006/05/02 16:51:05 hr 1.4.112.2: #i10000#: replace CLK_TCK with POSIX conforming sysconfig(_SC_CLK_TCK); clean up license header, remove log footer
2006/05/02 16:26:04 hr 1.4.112.1: #i55967#: no prefix for STL header please
Diffstat (limited to 'testtools/source/performance')
| -rw-r--r-- | testtools/source/performance/ubtest.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index 0a77383fda5c..4040e388a3fe 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ubtest.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-16 13:38:42 $ + * last change: $Author: vg $ $Date: 2006-11-22 10:39:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,8 +39,8 @@ #include <stdio.h> #include <math.h> #include <string> -#include <stl/hash_map> -#include <stl/map> +#include <hash_map> +#include <map> #include <osl/diagnose.h> #include <osl/mutex.hxx> @@ -57,6 +57,7 @@ #include <windows.h> #else #include <sys/times.h> +#include <unistd.h> #endif #include <rtl/string.hxx> @@ -112,7 +113,7 @@ static inline sal_uInt32 getSystemTicks() if ( !nImplTicksPerSecond ) { - nImplTicksPerSecond = CLK_TCK; + nImplTicksPerSecond = sysconf(_SC_CLK_TCK); dImplTicksPerSecond = nImplTicksPerSecond; dImplTicksULONGMAX = (double)(sal_uInt32)ULONG_MAX; } @@ -1345,4 +1346,3 @@ void * SAL_CALL component_getFactory( return pRet; } } - |