|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r66057 - sandbox/chrono/boost/detail/win
From: vicente.botet_at_[hidden]
Date: 2010-10-17 18:14:11
Author: viboes
Date: 2010-10-17 18:14:07 EDT (Sun, 17 Oct 2010)
New Revision: 66057
URL: http://svn.boost.org/trac/boost/changeset/66057
Log:
Chrono: Cleanup
Text files modified:
sandbox/chrono/boost/detail/win/GetCurrentThread.hpp | 2
sandbox/chrono/boost/detail/win/GetLastError.hpp | 14 ++--
sandbox/chrono/boost/detail/win/GetProcessTimes.hpp | 2
sandbox/chrono/boost/detail/win/GetThreadTimes.hpp | 2
sandbox/chrono/boost/detail/win/LocalFree.hpp | 2
sandbox/chrono/boost/detail/win/basic_types.hpp | 111 ++++++++++++++++++---------------------
sandbox/chrono/boost/detail/win/system.hpp | 28 +++++-----
sandbox/chrono/boost/detail/win/timers.hpp | 2
8 files changed, 76 insertions(+), 87 deletions(-)
Modified: sandbox/chrono/boost/detail/win/GetCurrentThread.hpp
==============================================================================
--- sandbox/chrono/boost/detail/win/GetCurrentThread.hpp (original)
+++ sandbox/chrono/boost/detail/win/GetCurrentThread.hpp 2010-10-17 18:14:07 EDT (Sun, 17 Oct 2010)
@@ -11,7 +11,7 @@
#include <boost/detail/win/basic_types.hpp>
-namespace boost {
+namespace boost {
namespace detail {
namespace win32 {
#if defined( BOOST_USE_WINDOWS_H )
Modified: sandbox/chrono/boost/detail/win/GetLastError.hpp
==============================================================================
--- sandbox/chrono/boost/detail/win/GetLastError.hpp (original)
+++ sandbox/chrono/boost/detail/win/GetLastError.hpp 2010-10-17 18:14:07 EDT (Sun, 17 Oct 2010)
@@ -23,9 +23,9 @@
{
namespace win32
{
-
+
using ::GetLastError;
-
+
}
}
}
@@ -40,13 +40,13 @@
{
extern "C"
{
-
+
// using ::GetLastError;
- __declspec(dllimport)
- DWORD_
- WINAPI
+ __declspec(dllimport)
+ DWORD_
+ WINAPI
GetLastError();
-
+
}
}
}
Modified: sandbox/chrono/boost/detail/win/GetProcessTimes.hpp
==============================================================================
--- sandbox/chrono/boost/detail/win/GetProcessTimes.hpp (original)
+++ sandbox/chrono/boost/detail/win/GetProcessTimes.hpp 2010-10-17 18:14:07 EDT (Sun, 17 Oct 2010)
@@ -11,7 +11,7 @@
#include <boost/detail/win/time.hpp>
-namespace boost {
+namespace boost {
namespace detail {
namespace win32 {
#if defined( BOOST_USE_WINDOWS_H )
Modified: sandbox/chrono/boost/detail/win/GetThreadTimes.hpp
==============================================================================
--- sandbox/chrono/boost/detail/win/GetThreadTimes.hpp (original)
+++ sandbox/chrono/boost/detail/win/GetThreadTimes.hpp 2010-10-17 18:14:07 EDT (Sun, 17 Oct 2010)
@@ -11,7 +11,7 @@
#include <boost/detail/win/time.hpp>
-namespace boost {
+namespace boost {
namespace detail {
namespace win32 {
#if defined( BOOST_USE_WINDOWS_H )
Modified: sandbox/chrono/boost/detail/win/LocalFree.hpp
==============================================================================
--- sandbox/chrono/boost/detail/win/LocalFree.hpp (original)
+++ sandbox/chrono/boost/detail/win/LocalFree.hpp 2010-10-17 18:14:07 EDT (Sun, 17 Oct 2010)
@@ -11,7 +11,7 @@
#include <boost/detail/win/basic_types.hpp>
-namespace boost {
+namespace boost {
namespace detail {
namespace win32 {
#if defined( BOOST_USE_WINDOWS_H )
Modified: sandbox/chrono/boost/detail/win/basic_types.hpp
==============================================================================
--- sandbox/chrono/boost/detail/win/basic_types.hpp (original)
+++ sandbox/chrono/boost/detail/win/basic_types.hpp 2010-10-17 18:14:07 EDT (Sun, 17 Oct 2010)
@@ -23,26 +23,26 @@
{
namespace win32
{
- typedef BOOL BOOL_;
- typedef unsigned short WORD_;
- typedef DWORD DWORD_;
- typedef HANDLE HANDLE_;
- typedef LONG LONG_;
- typedef LONGLONG LONGLONG_;
- typedef LARGE_INTEGER LARGE_INTEGER_;
- typedef PLARGE_INTEGER PLARGE_INTEGER_;
- typedef void *PVOID_;
- typedef void *LPVOID_;
- typedef char CHAR_;
- typedef CHAR_ *LPSTR_;
- typedef const CHAR_ *LPCSTR_;
- typedef wchar_t WCHAR_;
- typedef WCHAR_ *LPWSTR_;
- typedef const WCHAR_ *LPCWSTR_;
+ typedef BOOL BOOL_;
+ typedef unsigned short WORD_;
+ typedef DWORD DWORD_;
+ typedef HANDLE HANDLE_;
+ typedef LONG LONG_;
+ typedef LONGLONG LONGLONG_;
+ typedef LARGE_INTEGER LARGE_INTEGER_;
+ typedef PLARGE_INTEGER PLARGE_INTEGER_;
+ typedef void *PVOID_;
+ typedef void *LPVOID_;
+ typedef char CHAR_;
+ typedef CHAR_ *LPSTR_;
+ typedef const CHAR_ *LPCSTR_;
+ typedef wchar_t WCHAR_;
+ typedef WCHAR_ *LPWSTR_;
+ typedef const WCHAR_ *LPCWSTR_;
+
+
-
-
}
}
}
@@ -51,7 +51,7 @@
# include <WinError.h>
//# define WINAPI __stdcall
-// @FIXME Which condition must be tested
+// @FIXME Which condition must be tested
# ifdef UNDER_CE
# ifndef WINAPI
# ifndef _WIN32_WCE_EMULATION
@@ -74,48 +74,37 @@
{
extern "C"
{
- typedef int BOOL_;
- typedef unsigned short WORD_;
- typedef unsigned long DWORD_;
- typedef void* HANDLE_;
-
- typedef long LONG_;
-
-// @FIXME Which condition must be tested
-// #if !defined(_M_IX86)
- typedef __int64 LONGLONG_;
-// #else
-// typedef double LONGLONG_;
-// #endif
-
-// typedef union _LARGE_INTEGER_ {
-//// struct {
-//// DWORD_ LowPart;
-//// LONG_ HighPart;
-//// } ;
-// struct {
-// DWORD_ LowPart;
-// LONG_ HighPart;
-// } u;
-// LONGLONG_ QuadPart;
-// } LARGE_INTEGER_, *PLARGE_INTEGER_;
- typedef struct _LARGE_INTEGER {
- LONGLONG_ QuadPart;
- } LARGE_INTEGER_;
- typedef LARGE_INTEGER_ *PLARGE_INTEGER_;
-
- typedef void *PVOID_;
- typedef void *LPVOID_;
- typedef const void *LPCVOID_;
-
- typedef char CHAR_;
- typedef CHAR_ *LPSTR_;
- typedef const CHAR_ *LPCSTR_;
-
- typedef wchar_t WCHAR_;
- typedef WCHAR_ *LPWSTR_;
- typedef const WCHAR_ *LPCWSTR_;
-
+ typedef int BOOL_;
+ typedef unsigned short WORD_;
+ typedef unsigned long DWORD_;
+ typedef void* HANDLE_;
+
+ typedef long LONG_;
+
+// @FIXME Which condition must be tested
+// #if !defined(_M_IX86)
+ typedef __int64 LONGLONG_;
+// #else
+// typedef double LONGLONG_;
+// #endif
+
+ typedef struct _LARGE_INTEGER {
+ LONGLONG_ QuadPart;
+ } LARGE_INTEGER_;
+ typedef LARGE_INTEGER_ *PLARGE_INTEGER_;
+
+ typedef void *PVOID_;
+ typedef void *LPVOID_;
+ typedef const void *LPCVOID_;
+
+ typedef char CHAR_;
+ typedef CHAR_ *LPSTR_;
+ typedef const CHAR_ *LPCSTR_;
+
+ typedef wchar_t WCHAR_;
+ typedef WCHAR_ *LPWSTR_;
+ typedef const WCHAR_ *LPCWSTR_;
+
}
}
}
Modified: sandbox/chrono/boost/detail/win/system.hpp
==============================================================================
--- sandbox/chrono/boost/detail/win/system.hpp (original)
+++ sandbox/chrono/boost/detail/win/system.hpp 2010-10-17 18:14:07 EDT (Sun, 17 Oct 2010)
@@ -22,7 +22,7 @@
namespace win32
{
typedef HANDLE_ HLOCAL_;
-
+
using ::LocalFree;
using ::FormatMessageA;
using ::FormatMessageW;
@@ -34,15 +34,15 @@
const int FORMAT_MESSAGE_FROM_SYSTEM_= FORMAT_MESSAGE_FROM_SYSTEM;
const int FORMAT_MESSAGE_ARGUMENT_ARRAY_= FORMAT_MESSAGE_ARGUMENT_ARRAY;
const int FORMAT_MESSAGE_MAX_WIDTH_MASK_= FORMAT_MESSAGE_MAX_WIDTH_MASK;
-
+
const char LANG_NEUTRAL_= LANG_NEUTRAL;
const char LANG_INVARIANT_= LANG_INVARIANT;
-
+
const char SUBLANG_DEFAULT_= SUBLANG_DEFAULT; // user default
inline WORD_ MAKELANGID_(WORD_ p, WORD_ s) {
return MAKELANGID(p,s);
}
-
+
}
}
}
@@ -59,17 +59,17 @@
{
typedef HANDLE_ HLOCAL_;
-
+
// using ::LocalFree;
- __declspec(dllimport)
+ __declspec(dllimport)
HLOCAL_
WINAPI
LocalFree(
HLOCAL_ hMem
);
-
+
// using ::FormatMessageA;
- __declspec(dllimport)
+ __declspec(dllimport)
DWORD_
WINAPI
FormatMessageA(
@@ -81,9 +81,9 @@
DWORD_ nSize,
va_list *Arguments
);
-
+
// using ::FormatMessageW;
- __declspec(dllimport)
+ __declspec(dllimport)
DWORD_
WINAPI
FormatMessageW(
@@ -95,7 +95,7 @@
DWORD_ nSize,
va_list *Arguments
);
-
+
const int FORMAT_MESSAGE_ALLOCATE_BUFFER_= 0x00000100;
const int FORMAT_MESSAGE_IGNORE_INSERTS_= 0x00000200;
const int FORMAT_MESSAGE_FROM_STRING_= 0x00000400;
@@ -103,15 +103,15 @@
const int FORMAT_MESSAGE_FROM_SYSTEM_= 0x00001000;
const int FORMAT_MESSAGE_ARGUMENT_ARRAY_= 0x00002000;
const int FORMAT_MESSAGE_MAX_WIDTH_MASK_= 0x000000FF;
-
+
const char LANG_NEUTRAL_= 0x00;
const char LANG_INVARIANT_= 0x7f;
-
+
const char SUBLANG_DEFAULT_= 0x01; // user default
inline WORD_ MAKELANGID_(WORD_ p, WORD_ s) {
return ((((WORD_ )(s)) << 10) | (WORD_ )(p));
}
-
+
}
}
}
Modified: sandbox/chrono/boost/detail/win/timers.hpp
==============================================================================
--- sandbox/chrono/boost/detail/win/timers.hpp (original)
+++ sandbox/chrono/boost/detail/win/timers.hpp 2010-10-17 18:14:07 EDT (Sun, 17 Oct 2010)
@@ -31,7 +31,7 @@
QueryPerformanceFrequency(
LARGE_INTEGER_ *lpFrequency
);
-#endif
+#endif
}
}
}
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