Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r65999 - sandbox/chrono/boost/detail/win
From: vicente.botet_at_[hidden]
Date: 2010-10-16 00:54:56


Author: viboes
Date: 2010-10-16 00:54:54 EDT (Sat, 16 Oct 2010)
New Revision: 65999
URL: http://svn.boost.org/trac/boost/changeset/65999

Log:
Chrono: win32
* Fix some types in boost/detail/win/time.hpp
* Use WinErr.h
Text files modified:
   sandbox/chrono/boost/detail/win/time.hpp | 42 ++++++++++++++++++++-------------------
   1 files changed, 22 insertions(+), 20 deletions(-)

Modified: sandbox/chrono/boost/detail/win/time.hpp
==============================================================================
--- sandbox/chrono/boost/detail/win/time.hpp (original)
+++ sandbox/chrono/boost/detail/win/time.hpp 2010-10-16 00:54:54 EDT (Sat, 16 Oct 2010)
@@ -53,8 +53,8 @@
 # include <WinError.h>
 //# define WINAPI __stdcall
 
-//# ifdef UNDER_CE
-# if defined(_WIN32_WCE)
+// @FIXME Which condition must be tested
+# ifdef UNDER_CE
 # ifndef WINAPI
 # ifndef _WIN32_WCE_EMULATION
 # define WINAPI __cdecl // Note this doesn't match the desktop definition
@@ -69,7 +69,6 @@
 
 
 
-//# include <kfuncs.h>
 # ifdef __cplusplus
 }
 # endif
@@ -94,24 +93,29 @@
                     typedef void* HANDLE_;
                     
                     typedef long LONG_;
-
- #if !defined(_M_IX86)
+
+// @FIXME Which condition must be tested
+// #if !defined(_M_IX86)
                     typedef __int64 LONGLONG_;
- #else
- typedef double LONGLONG_;
- #endif
-
- typedef union _LARGE_INTEGER_ {
+// #else
+// typedef double LONGLONG_;
+// #endif
+
+// typedef union _LARGE_INTEGER_ {
+//// struct {
+//// DWORD_ LowPart;
+//// LONG_ HighPart;
+//// } ;
 // struct {
 // DWORD_ LowPart;
 // LONG_ HighPart;
-// } ;
- struct {
- DWORD_ LowPart;
- LONG_ HighPart;
- } u;
- LONGLONG_ QuadPart;
- } LARGE_INTEGER_, *PLARGE_INTEGER_;
+// } u;
+// LONGLONG_ QuadPart;
+// } LARGE_INTEGER_, *PLARGE_INTEGER_;
+ typedef struct _LARGE_INTEGER {
+ LONGLONG_ QuadPart;
+ } LARGE_INTEGER_;
+ typedef LARGE_INTEGER_ *PLARGE_INTEGER_;
                     
                     typedef struct _FILETIME {
                       DWORD_ dwLowDateTime;
@@ -182,9 +186,7 @@
                     QueryPerformanceFrequency(
                       LARGE_INTEGER_ *lpFrequency
                     );
-
- static const DWORD_ ERROR_NOT_SUPPORTED_ = ERROR_NOT_SUPPORTED; //??
-
+
             }
         }
     }


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk