diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 10:31:24 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 10:31:24 +0000 |
| commit | 40dbbd2db3a4f1b61e20cf6efb36d661e8a6c332 (patch) | |
| tree | 38c2f96ca8f534970100004b0ba8cdc993ba7fe2 /canvas/source | |
| parent | 4f496ef8f45e0d328f3851baf9d7001dd36605fc (diff) | |
INTEGRATION: CWS sb59 (1.6.16); FILE MERGED
2006/08/11 22:05:05 thb 1.6.16.1: #i68336# Made canvas warning free for wntmsci10
Diffstat (limited to 'canvas/source')
| -rw-r--r-- | canvas/source/tools/elapsedtime.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index a7daaf07d2e9..c97857dc0600 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -4,9 +4,9 @@ * * $RCSfile: elapsedtime.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-09-17 03:25:35 $ + * last change: $Author: obo $ $Date: 2006-10-12 11:31:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,6 +42,10 @@ #if defined(WIN) || defined(WNT) +#if defined _MSC_VER +#pragma warning(push,1) +#endif + // TEMP!!! // Awaiting corresponding functionality in OSL // @@ -51,6 +55,10 @@ #include <mmsystem.h> #endif +#if defined _MSC_VER +#pragma warning(pop) +#endif + #include <algorithm> #include <limits> |