Boost-Commit :

Date view	Thread view	Subject view	Author view

From: xushiweizh_at_[hidden]
Date: 2008-04-29 21:48:23

Next message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r44904 - trunk/libs/spirit/test/karma"
Previous message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r44902 - trunk/boost"

Author: xushiwei
Date: 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
New Revision: 44903
URL: http://svn.boost.org/trac/boost/changeset/44903

Log:
On Wed, Apr 30, 2008 at 5:09 AM, Steven Watanabe <watanabesj_at_[hidden]> wrote:

Don't use reserved identifiers. (Any name containing a double
underscore is reserved).

    In Christ,
    Steven Watanabe
Text files modified:
   sandbox/memory/boost/memory.hpp | 16 ++++++++--------
   sandbox/memory/boost/memory/auto_alloc.hpp | 16 ++++++++--------
   sandbox/memory/boost/memory/basic.hpp | 32 ++++++++++++++++----------------
   sandbox/memory/boost/memory/gc_alloc.hpp | 15 ++++++++-------
   sandbox/memory/boost/memory/linklib.hpp | 10 +++++-----
   sandbox/memory/boost/memory/policy.hpp | 12 ++++++------
   sandbox/memory/boost/memory/scoped_alloc.hpp | 16 ++++++++--------
   sandbox/memory/boost/memory/system_alloc.hpp | 22 +++++++++++-----------
   sandbox/memory/boost/memory/thread/tls.hpp | 30 +++++++++++++++---------------
   sandbox/memory/boost/memory/threadmodel.hpp | 14 +++++++-------
   sandbox/memory/boost/memory/threadmodel/multi_thread.hpp | 14 ++++++++------
   sandbox/memory/boost/memory/threadmodel/single_thread.hpp | 12 ++++++------
   sandbox/memory/boost/memory/winapi/posix/pthread.hpp | 8 ++++----
   sandbox/memory/boost/memory/winapi/winbase.h | 10 +++++-----
   sandbox/memory/boost/memory/winapi/windef.h | 6 +++---
   sandbox/memory/boost/memory/winapi/wtypes.h | 8 ++++----
   sandbox/memory/libs/memory/src/block_pool.cpp | 2 +-
   sandbox/memory/libs/memory/test/test.cpp | 1 -
   18 files changed, 123 insertions(+), 121 deletions(-)

Modified: sandbox/memory/boost/memory.hpp
==============================================================================
--- sandbox/memory/boost/memory.hpp (original)
+++ sandbox/memory/boost/memory.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,27 +9,27 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_HPP__
-#define __BOOST_MEMORY_HPP__
+#ifndef _BOOST_MEMORY_HPP_
+#define _BOOST_MEMORY_HPP_

// -------------------------------------------------------------------------

-#ifndef __BOOST_MEMORY_AUTO_ALLOC_HPP__
+#ifndef _BOOST_MEMORY_AUTO_ALLOC_HPP_
#include "memory/auto_alloc.hpp"
#endif

-#ifndef __BOOST_MEMORY_SCOPED_ALLOC_HPP__
+#ifndef _BOOST_MEMORY_SCOPED_ALLOC_HPP_
#include "memory/scoped_alloc.hpp"
#endif

-#ifndef __BOOST_MEMORY_GC_ALLOC_HPP__
+#ifndef _BOOST_MEMORY_GC_ALLOC_HPP_
#include "memory/gc_alloc.hpp"
#endif

// -------------------------------------------------------------------------
// class stl_alloc

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

template <class _Ty, class _Alloc = scoped_alloc>
class stl_alloc
@@ -113,9 +113,9 @@
return false;
}

-__NS_BOOST_END
+_NS_BOOST_END

// -------------------------------------------------------------------------
// $Log: memory.hpp,v $

-#endif /* __BOOST_MEMORY_HPP__ */
+#endif /* _BOOST_MEMORY_HPP_ */

Modified: sandbox/memory/boost/memory/auto_alloc.hpp
==============================================================================
--- sandbox/memory/boost/memory/auto_alloc.hpp (original)
+++ sandbox/memory/boost/memory/auto_alloc.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,18 +9,18 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_AUTO_ALLOC_HPP__
-#define __BOOST_MEMORY_AUTO_ALLOC_HPP__
+#ifndef _BOOST_MEMORY_AUTO_ALLOC_HPP_
+#define _BOOST_MEMORY_AUTO_ALLOC_HPP_

-#ifndef __BOOST_MEMORY_SYSTEM_ALLOC_HPP__
+#ifndef _BOOST_MEMORY_SYSTEM_ALLOC_HPP_
#include "system_alloc.hpp"
#endif

-#ifndef __BOOST_MEMORY_POLICY_HPP__
+#ifndef _BOOST_MEMORY_POLICY_HPP_
#include "policy.hpp"
#endif

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

// -------------------------------------------------------------------------
// class region_alloc
@@ -203,7 +203,7 @@
// no action
}

- __BOOST_FAKE_DBG_ALLOCATE();
+ _BOOST_FAKE_DBG_ALLOCATE();
};

// -------------------------------------------------------------------------
@@ -214,6 +214,6 @@
// -------------------------------------------------------------------------
// $Log: auto_alloc.hpp,v $

-__NS_BOOST_END
+_NS_BOOST_END

-#endif /* __BOOST_MEMORY_AUTO_ALLOC_HPP__ */
+#endif /* _BOOST_MEMORY_AUTO_ALLOC_HPP_ */

Modified: sandbox/memory/boost/memory/basic.hpp
==============================================================================
--- sandbox/memory/boost/memory/basic.hpp (original)
+++ sandbox/memory/boost/memory/basic.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,8 +9,8 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_BASIC_HPP__
-#define __BOOST_MEMORY_BASIC_HPP__
+#ifndef _BOOST_MEMORY_BASIC_HPP_
+#define _BOOST_MEMORY_BASIC_HPP_

// -------------------------------------------------------------------------

@@ -38,9 +38,9 @@

// -------------------------------------------------------------------------

-#ifndef __NS_BOOST_BEGIN
-#define __NS_BOOST_BEGIN namespace boost {
-#define __NS_BOOST_END }
+#ifndef _NS_BOOST_BEGIN
+#define _NS_BOOST_BEGIN namespace boost {
+#define _NS_BOOST_END }
#endif

// =========================================================================
@@ -79,10 +79,10 @@
// =========================================================================
// constructor_traits, destructor_traits

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

-typedef void BOOST_MEMORY_CALL __FnDestructor(void* data);
-typedef __FnDestructor* destructor_t;
+typedef void BOOST_MEMORY_CALL _FnDestructor(void* data);
+typedef _FnDestructor* destructor_t;

template <class Type>
struct constructor_traits
@@ -153,13 +153,13 @@
         destructor_traits<Type>::destructArrayN(array, count);
}

-__NS_BOOST_END
+_NS_BOOST_END

// =========================================================================
// BOOST_NO_DESTRUCTOR

#define BOOST_NO_DESTRUCTOR(Type) \
-__NS_BOOST_BEGIN \
+_NS_BOOST_BEGIN \
template <> \
struct destructor_traits< Type > \
{ \
@@ -184,7 +184,7 @@
                 return 0; \
         } \
}; \
-__NS_BOOST_END
+_NS_BOOST_END

#define BOOST_INT_NO_DESTRUCTOR(Type) \
         BOOST_NO_DESTRUCTOR(unsigned Type); \
@@ -194,7 +194,7 @@
// BOOST_NO_CONSTRUCTOR

#define BOOST_NO_CONSTRUCTOR(Type) \
-__NS_BOOST_BEGIN \
+_NS_BOOST_BEGIN \
template <> \
struct constructor_traits< Type > \
{ \
@@ -205,7 +205,7 @@
                 return array; \
         } \
}; \
-__NS_BOOST_END
+_NS_BOOST_END

#define BOOST_INT_NO_CONSTRUCTOR(Type) \
         BOOST_NO_CONSTRUCTOR(unsigned Type); \
@@ -262,7 +262,7 @@

// =========================================================================

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

inline void BOOST_MEMORY_CALL enableMemoryLeakCheck()
{
@@ -271,9 +271,9 @@
#endif
}

-__NS_BOOST_END
+_NS_BOOST_END

// =========================================================================
// $Log: basic.hpp,v $

-#endif /* __BOOST_MEMORY_BASIC_HPP__ */
+#endif /* _BOOST_MEMORY_BASIC_HPP_ */

Modified: sandbox/memory/boost/memory/gc_alloc.hpp
==============================================================================
--- sandbox/memory/boost/memory/gc_alloc.hpp (original)
+++ sandbox/memory/boost/memory/gc_alloc.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,14 +9,14 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_GC_ALLOC_HPP__
-#define __BOOST_MEMORY_GC_ALLOC_HPP__
+#ifndef _BOOST_MEMORY_GC_ALLOC_HPP_
+#define _BOOST_MEMORY_GC_ALLOC_HPP_

-#ifndef __BOOST_MEMORY_SCOPED_ALLOC_HPP__
+#ifndef _BOOST_MEMORY_SCOPED_ALLOC_HPP_
#include "scoped_alloc.hpp"
#endif

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

// -------------------------------------------------------------------------
// class gen_alloc
@@ -347,6 +347,7 @@
                 pNode->fnDestroy = fn;
                 pNode->pPrev = m_destroyChain;
                 m_destroyChain = (_MemHeaderEx*)((char*)pNode - sizeof(_MemHeader));
+ m_destroyChain->blkType = nodeAllocedWithDestructor;
                 return pNode + 1;
         }

@@ -367,7 +368,7 @@
                 p->blkType = nodeFree;
         }

- __BOOST_FAKE_DBG_ALLOCATE();
+ _BOOST_FAKE_DBG_ALLOCATE();
};

// -------------------------------------------------------------------------
@@ -378,6 +379,6 @@
// -------------------------------------------------------------------------
// $Log: gc_alloc.hpp,v $

-__NS_BOOST_END
+_NS_BOOST_END

-#endif /* __BOOST_MEMORY_GC_ALLOC_HPP__ */
+#endif /* _BOOST_MEMORY_GC_ALLOC_HPP_ */

Modified: sandbox/memory/boost/memory/linklib.hpp
==============================================================================
--- sandbox/memory/boost/memory/linklib.hpp (original)
+++ sandbox/memory/boost/memory/linklib.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,13 +9,13 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_LINKLIB_HPP__
-#define __BOOST_MEMORY_LINKLIB_HPP__
+#ifndef _BOOST_MEMORY_LINKLIB_HPP_
+#define _BOOST_MEMORY_LINKLIB_HPP_

// -------------------------------------------------------------------------

-#if !defined(__Linked_boost_memory)
-#define __Linked_boost_memory
+#if !defined(_Linked_boost_memory)
+#define _Linked_boost_memory
#if defined(_MSC_VER)
# pragma comment(lib, "boost-memory")
#endif
@@ -24,4 +24,4 @@
// -------------------------------------------------------------------------
// $Log: linklib.hpp,v $

-#endif /* __BOOST_MEMORY_LINKLIB_HPP__ */
+#endif /* _BOOST_MEMORY_LINKLIB_HPP_ */

Modified: sandbox/memory/boost/memory/policy.hpp
==============================================================================
--- sandbox/memory/boost/memory/policy.hpp (original)
+++ sandbox/memory/boost/memory/policy.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,14 +9,14 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_POLICY_HPP__
-#define __BOOST_MEMORY_POLICY_HPP__
+#ifndef _BOOST_MEMORY_POLICY_HPP_
+#define _BOOST_MEMORY_POLICY_HPP_

-#ifndef __BOOST_MEMORY_SYSTEM_ALLOC_HPP__
+#ifndef _BOOST_MEMORY_SYSTEM_ALLOC_HPP_
#include "system_alloc.hpp"
#endif

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

// -------------------------------------------------------------------------
// class simple_gc_alloc
@@ -125,6 +125,6 @@
// -------------------------------------------------------------------------
// $Log: policy.hpp,v $

-__NS_BOOST_END
+_NS_BOOST_END

-#endif /* __BOOST_MEMORY_POLICY_HPP__ */
+#endif /* _BOOST_MEMORY_POLICY_HPP_ */

Modified: sandbox/memory/boost/memory/scoped_alloc.hpp
==============================================================================
--- sandbox/memory/boost/memory/scoped_alloc.hpp (original)
+++ sandbox/memory/boost/memory/scoped_alloc.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,18 +9,18 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_SCOPED_ALLOC_HPP__
-#define __BOOST_MEMORY_SCOPED_ALLOC_HPP__
+#ifndef _BOOST_MEMORY_SCOPED_ALLOC_HPP_
+#define _BOOST_MEMORY_SCOPED_ALLOC_HPP_

-#ifndef __BOOST_MEMORY_BASIC_HPP__
+#ifndef _BOOST_MEMORY_BASIC_HPP_
#include "basic.hpp"
#endif

-#ifndef __BOOST_MEMORY_AUTO_ALLOC_HPP__
+#ifndef _BOOST_MEMORY_AUTO_ALLOC_HPP_
#include "auto_alloc.hpp"
#endif

-#ifndef __BOOST_MEMORY_THREAD_TLS_HPP__
+#ifndef _BOOST_MEMORY_THREAD_TLS_HPP_
#include "thread/tls.hpp"
#endif

@@ -28,7 +28,7 @@
#include <climits> // INT_MAX
#endif

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

// -------------------------------------------------------------------------
// class proxy_alloc
@@ -191,6 +191,6 @@
// -------------------------------------------------------------------------
// $Log: $

-__NS_BOOST_END
+_NS_BOOST_END

-#endif /* __BOOST_MEMORY_SCOPED_ALLOC_HPP__ */
+#endif /* _BOOST_MEMORY_SCOPED_ALLOC_HPP_ */

Modified: sandbox/memory/boost/memory/system_alloc.hpp
==============================================================================
--- sandbox/memory/boost/memory/system_alloc.hpp (original)
+++ sandbox/memory/boost/memory/system_alloc.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,14 +9,14 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_SYSTEM_ALLOC_HPP__
-#define __BOOST_MEMORY_SYSTEM_ALLOC_HPP__
+#ifndef _BOOST_MEMORY_SYSTEM_ALLOC_HPP_
+#define _BOOST_MEMORY_SYSTEM_ALLOC_HPP_

-#ifndef __BOOST_MEMORY_BASIC_HPP__
+#ifndef _BOOST_MEMORY_BASIC_HPP_
#include "basic.hpp"
#endif

-#ifndef __BOOST_MEMORY_THREADMODEL_HPP__
+#ifndef _BOOST_MEMORY_THREADMODEL_HPP_
#include "threadmodel.hpp"
#endif

@@ -28,14 +28,14 @@
#include <cstdlib> // malloc, free
#endif

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

// -------------------------------------------------------------------------
-// __BOOST_FAKE_DBG_ALLOCATE
+// _BOOST_FAKE_DBG_ALLOCATE

#if defined(_DEBUG)

-#define __BOOST_FAKE_DBG_ALLOCATE() \
+#define _BOOST_FAKE_DBG_ALLOCATE() \
         void* BOOST_MEMORY_CALL allocate(size_t cb, LPCSTR szFile, int nLine) \
                 { return allocate(cb); } \
         void* BOOST_MEMORY_CALL allocate(size_t cb, destructor_t fn, LPCSTR szFile, int nLine) \
@@ -50,7 +50,7 @@

#else

-#define __BOOST_FAKE_DBG_ALLOCATE()
+#define _BOOST_FAKE_DBG_ALLOCATE()

#endif

@@ -122,7 +122,7 @@
                 return constructor_traits<Type>::constructArray(array, count);
         }
#else
- __BOOST_FAKE_DBG_ALLOCATE()
+ _BOOST_FAKE_DBG_ALLOCATE()
#endif
};

@@ -134,6 +134,6 @@
// -------------------------------------------------------------------------
// $Log: $

-__NS_BOOST_END
+_NS_BOOST_END

-#endif /* __BOOST_MEMORY_SYSTEM_ALLOC_HPP__ */
+#endif /* _BOOST_MEMORY_SYSTEM_ALLOC_HPP_ */

Modified: sandbox/memory/boost/memory/thread/tls.hpp
==============================================================================
--- sandbox/memory/boost/memory/thread/tls.hpp (original)
+++ sandbox/memory/boost/memory/thread/tls.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,14 +9,14 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_THREAD_TLS_HPP__
-#define __BOOST_MEMORY_THREAD_TLS_HPP__
+#ifndef _BOOST_MEMORY_THREAD_TLS_HPP_
+#define _BOOST_MEMORY_THREAD_TLS_HPP_

-#ifndef __BOOST_MEMORY_BASIC_HPP__
+#ifndef _BOOST_MEMORY_BASIC_HPP_
#include "../basic.hpp"
#endif

-#ifndef __BOOST_MEMORY_THREADMODEL_HPP__
+#ifndef _BOOST_MEMORY_THREADMODEL_HPP_
#include "../threadmodel.hpp"
#endif

@@ -25,7 +25,7 @@

#if defined(_WIN32)

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

typedef DWORD TLSINDEX;

@@ -56,7 +56,7 @@
         }
};

-__NS_BOOST_END
+_NS_BOOST_END

#endif // defined(_WIN32)

@@ -69,7 +69,7 @@
#include <pthread.h>
#endif

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

class pthread_tls_key
{
@@ -98,14 +98,14 @@
         }
};

-__NS_BOOST_END
+_NS_BOOST_END

#endif // !defined(_WIN32)

// -------------------------------------------------------------------------
// class tls_key

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

#if defined(_WIN32)

@@ -117,12 +117,12 @@

#endif

-__NS_BOOST_END
+_NS_BOOST_END

// -------------------------------------------------------------------------
// class tls_ptr

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

template <class Type>
class tls_ptr
@@ -163,12 +163,12 @@
         }
};

-__NS_BOOST_END
+_NS_BOOST_END

// -------------------------------------------------------------------------
// class tls_object

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

template <class Type>
class tls_factory
@@ -238,9 +238,9 @@
         }
};

-__NS_BOOST_END
+_NS_BOOST_END

// -------------------------------------------------------------------------
// $Log: $

-#endif /* __BOOST_MEMORY_THREAD_TLS_HPP__ */
+#endif /* _BOOST_MEMORY_THREAD_TLS_HPP_ */

Modified: sandbox/memory/boost/memory/threadmodel.hpp
==============================================================================
--- sandbox/memory/boost/memory/threadmodel.hpp (original)
+++ sandbox/memory/boost/memory/threadmodel.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,20 +9,20 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_THREADMODEL_HPP__
-#define __BOOST_MEMORY_THREADMODEL_HPP__
+#ifndef _BOOST_MEMORY_THREADMODEL_HPP_
+#define _BOOST_MEMORY_THREADMODEL_HPP_

// -------------------------------------------------------------------------

-#ifndef __BOOST_MEMORY_THREADMODEL_SINGLE_THREAD_H__
+#ifndef _BOOST_MEMORY_THREADMODEL_SINGLE_THREAD_H_
#include "threadmodel/single_thread.hpp"
#endif

-#ifndef __BOOST_MEMORY_THREADMODEL_MULTI_THREAD_H__
+#ifndef _BOOST_MEMORY_THREADMODEL_MULTI_THREAD_H_
#include "threadmodel/multi_thread.hpp"
#endif

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

// -------------------------------------------------------------------------
// class auto_lock
@@ -90,6 +90,6 @@
// -------------------------------------------------------------------------
// $Log: $

-__NS_BOOST_END
+_NS_BOOST_END

-#endif /* __BOOST_MEMORY_THREADMODEL_HPP__ */
+#endif /* _BOOST_MEMORY_THREADMODEL_HPP_ */

Modified: sandbox/memory/boost/memory/threadmodel/multi_thread.hpp
==============================================================================
--- sandbox/memory/boost/memory/threadmodel/multi_thread.hpp (original)
+++ sandbox/memory/boost/memory/threadmodel/multi_thread.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,16 +9,18 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_THREADMODEL_MULTI_THREAD_H__
-#define __BOOST_MEMORY_THREADMODEL_MULTI_THREAD_H__
+#ifndef _BOOST_MEMORY_THREADMODEL_MULTI_THREAD_H_
+#define _BOOST_MEMORY_THREADMODEL_MULTI_THREAD_H_

-#ifndef __BOOST_MEMORY_BASIC_HPP__
+#ifndef _BOOST_MEMORY_BASIC_HPP_
#include "../basic.hpp"
#endif

+#ifndef _BOOST_MEMORY_WINAPI_WINBASE_H_
#include "../winapi/winbase.h"
+#endif

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

// -------------------------------------------------------------------------
// class refcount_mt
@@ -90,6 +92,6 @@
// -------------------------------------------------------------------------
// $Log: $

-__NS_BOOST_END
+_NS_BOOST_END

-#endif /* __BOOST_MEMORY_THREADMODEL_MULTI_THREAD_H__ */
+#endif /* _BOOST_MEMORY_THREADMODEL_MULTI_THREAD_H_ */

Modified: sandbox/memory/boost/memory/threadmodel/single_thread.hpp
==============================================================================
--- sandbox/memory/boost/memory/threadmodel/single_thread.hpp (original)
+++ sandbox/memory/boost/memory/threadmodel/single_thread.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,14 +9,14 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_THREADMODEL_SINGLE_THREAD_H__
-#define __BOOST_MEMORY_THREADMODEL_SINGLE_THREAD_H__
+#ifndef _BOOST_MEMORY_THREADMODEL_SINGLE_THREAD_H_
+#define _BOOST_MEMORY_THREADMODEL_SINGLE_THREAD_H_

-#ifndef __BOOST_MEMORY_BASIC_HPP__
+#ifndef _BOOST_MEMORY_BASIC_HPP_
#include "../basic.hpp"
#endif

-__NS_BOOST_BEGIN
+_NS_BOOST_BEGIN

// -------------------------------------------------------------------------
// struct refcount_st
@@ -56,6 +56,6 @@
// -------------------------------------------------------------------------
// $Log: $

-__NS_BOOST_END
+_NS_BOOST_END

-#endif /* __BOOST_MEMORY_THREADMODEL_SINGLE_THREAD_H__ */
+#endif /* _BOOST_MEMORY_THREADMODEL_SINGLE_THREAD_H_ */

Modified: sandbox/memory/boost/memory/winapi/posix/pthread.hpp
==============================================================================
--- sandbox/memory/boost/memory/winapi/posix/pthread.hpp (original)
+++ sandbox/memory/boost/memory/winapi/posix/pthread.hpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,10 +9,10 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_WINAPI_POSIX_PTHREAD_HPP__
-#define __BOOST_MEMORY_WINAPI_POSIX_PTHREAD_HPP__
+#ifndef _BOOST_MEMORY_WINAPI_POSIX_PTHREAD_HPP_
+#define _BOOST_MEMORY_WINAPI_POSIX_PTHREAD_HPP_

-#ifndef __BOOST_MEMORY_WINAPI_WINDEF_H__
+#ifndef _BOOST_MEMORY_WINAPI_WINDEF_H_
#include "../windef.h"
#endif

@@ -108,4 +108,4 @@
// -------------------------------------------------------------------------
// $Log: $

-#endif /* __BOOST_MEMORY_WINAPI_POSIX_PTHREAD_HPP__ */
+#endif /* _BOOST_MEMORY_WINAPI_POSIX_PTHREAD_HPP_ */

Modified: sandbox/memory/boost/memory/winapi/winbase.h
==============================================================================
--- sandbox/memory/boost/memory/winapi/winbase.h (original)
+++ sandbox/memory/boost/memory/winapi/winbase.h 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,8 +9,8 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_WINAPI_WINBASE_H__
-#define __BOOST_MEMORY_WINAPI_WINBASE_H__
+#ifndef _BOOST_MEMORY_WINAPI_WINBASE_H_
+#define _BOOST_MEMORY_WINAPI_WINBASE_H_

#if defined(_WIN32)

@@ -26,11 +26,11 @@

#define BOOST_NO_WINSDK

-#ifndef __BOOST_MEMORY_WINAPI_WTYPES_H__
+#ifndef _BOOST_MEMORY_WINAPI_WTYPES_H_
#include "wtypes.h"
#endif

-#ifndef __BOOST_MEMORY_WINAPI_POSIX_PTHREAD_HPP__
+#ifndef _BOOST_MEMORY_WINAPI_POSIX_PTHREAD_HPP_
#include "posix/pthread.hpp"
#endif

@@ -39,4 +39,4 @@
// -------------------------------------------------------------------------
// $Log: $

-#endif /* __BOOST_MEMORY_WINAPI_WINBASE_H__ */
+#endif /* _BOOST_MEMORY_WINAPI_WINBASE_H_ */

Modified: sandbox/memory/boost/memory/winapi/windef.h
==============================================================================
--- sandbox/memory/boost/memory/winapi/windef.h (original)
+++ sandbox/memory/boost/memory/winapi/windef.h 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,8 +9,8 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_WINAPI_WINDEF_H__
-#define __BOOST_MEMORY_WINAPI_WINDEF_H__
+#ifndef _BOOST_MEMORY_WINAPI_WINDEF_H_
+#define _BOOST_MEMORY_WINAPI_WINDEF_H_

#ifndef BOOST_NO_WINSDK
#error "Don't include <winapi/windef.h>"
@@ -565,4 +565,4 @@
// -------------------------------------------------------------------------
// $Log: $

-#endif /* __BOOST_MEMORY_WINAPI_WINDEF_H__ */
+#endif /* _BOOST_MEMORY_WINAPI_WINDEF_H_ */

Modified: sandbox/memory/boost/memory/winapi/wtypes.h
==============================================================================
--- sandbox/memory/boost/memory/winapi/wtypes.h (original)
+++ sandbox/memory/boost/memory/winapi/wtypes.h 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -9,14 +9,14 @@
//
// See http://www.boost.org/libs/memory/index.htm for documentation.
//
-#ifndef __BOOST_MEMORY_WINAPI_WTYPES_H__
-#define __BOOST_MEMORY_WINAPI_WTYPES_H__
+#ifndef _BOOST_MEMORY_WINAPI_WTYPES_H_
+#define _BOOST_MEMORY_WINAPI_WTYPES_H_

#if !defined(BOOST_NO_WINSDK)
#error "Don't include <winapi/wtypes.h>"
#endif

-#ifndef __BOOST_MEMORY_WINAPI_WINDEF_H__
+#ifndef _BOOST_MEMORY_WINAPI_WINDEF_H_
#include "windef.h"
#endif

@@ -232,4 +232,4 @@
// =========================================================================
// $Log: $

-#endif /* __BOOST_MEMORY_WINAPI_WTYPES_H__ */
+#endif /* _BOOST_MEMORY_WINAPI_WTYPES_H_ */

Modified: sandbox/memory/libs/memory/src/block_pool.cpp
==============================================================================
--- sandbox/memory/libs/memory/src/block_pool.cpp (original)
+++ sandbox/memory/libs/memory/src/block_pool.cpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -33,7 +33,7 @@
~tls_block_pool_init() { _tls_blockPool.term(); }
};

-// tls_block_pool_init _tls_blockPoolInit;
+tls_block_pool_init _tls_blockPoolInit;

// -------------------------------------------------------------------------
// $Log: $

Modified: sandbox/memory/libs/memory/test/test.cpp
==============================================================================
--- sandbox/memory/libs/memory/test/test.cpp (original)
+++ sandbox/memory/libs/memory/test/test.cpp 2008-04-29 21:48:21 EDT (Tue, 29 Apr 2008)
@@ -18,7 +18,6 @@

int main()
{
- boost::tls_block_pool bp;
simpleExamples();
// testStlContainers();
return 0;

Next message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r44904 - trunk/libs/spirit/test/karma"
Previous message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r44902 - trunk/boost"

Date view	Thread view	Subject view	Author view

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