[Boost-commit] svn:boost r45545 - trunk/boost/detail

From: pdimov_at_[hidden]
Date: 2008-05-19 11:09:54

Author: pdimov
Date: 2008-05-19 11:09:54 EDT (Mon, 19 May 2008)
New Revision: 45545
URL: http://svn.boost.org/trac/boost/changeset/45545

Log:
Renamed CRITICAL_SECTION to critical_section to avoid ambiguity.
Text files modified: 
   trunk/boost/detail/lwm_win32_cs.hpp |    16 ++++++++++------                        
   1 files changed, 10 insertions(+), 6 deletions(-)

Modified: trunk/boost/detail/lwm_win32_cs.hpp
==============================================================================
--- trunk/boost/detail/lwm_win32_cs.hpp	(original)
+++ trunk/boost/detail/lwm_win32_cs.hpp	2008-05-19 11:09:54 EDT (Mon, 19 May 2008)
@@ -29,7 +29,7 @@
 
 #ifndef BOOST_USE_WINDOWS_H
 
-struct CRITICAL_SECTION
+struct critical_section
 {
     struct critical_section_debug * DebugInfo;
     long LockCount;
@@ -43,10 +43,14 @@
 #endif
 };
 
-extern "C" __declspec(dllimport) void __stdcall InitializeCriticalSection(CRITICAL_SECTION *);
-extern "C" __declspec(dllimport) void __stdcall EnterCriticalSection(CRITICAL_SECTION *);
-extern "C" __declspec(dllimport) void __stdcall LeaveCriticalSection(CRITICAL_SECTION *);
-extern "C" __declspec(dllimport) void __stdcall DeleteCriticalSection(CRITICAL_SECTION *);
+extern "C" __declspec(dllimport) void __stdcall InitializeCriticalSection(critical_section *);
+extern "C" __declspec(dllimport) void __stdcall EnterCriticalSection(critical_section *);
+extern "C" __declspec(dllimport) void __stdcall LeaveCriticalSection(critical_section *);
+extern "C" __declspec(dllimport) void __stdcall DeleteCriticalSection(critical_section *);
+
+#else
+
+typedef ::CRITICAL_SECTION critical_section;
 
 #endif // #ifndef BOOST_USE_WINDOWS_H
 
@@ -54,7 +58,7 @@
 {
 private:
 
-    CRITICAL_SECTION cs_;
+    critical_section cs_;
 
     lightweight_mutex(lightweight_mutex const &);
     lightweight_mutex & operator=(lightweight_mutex const &);