summaryrefslogtreecommitdiff
path: root/ace/Malloc_T.h
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-20 02:34:57 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-20 02:34:57 +0000
commit5c1001ce4f585836e1f83c28d1df89aee42fb743 (patch)
tree5967e9ca7d44ed1d2823be9746817ebb8e025f5d /ace/Malloc_T.h
parent2ae14b2b85ad813a269e8a5529aa76cf984fa8a5 (diff)
downloadATCD-5c1001ce4f585836e1f83c28d1df89aee42fb743.tar.gz
changed include protection from #if !defined to ifndef, and added #pragma once, if possible
Diffstat (limited to 'ace/Malloc_T.h')
-rw-r--r--ace/Malloc_T.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index fce3ae24943..4c49896d923 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -18,14 +18,15 @@
#define ACE_MALLOC_T_H
#include "ace/ACE.h"
-#include "ace/Synch.h"
-#include "ace/Malloc.h"
-#include "ace/Free_List.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "ace/Synch.h"
+#include "ace/Malloc.h"
+#include "ace/Free_List.h"
+
template <class T>
class ACE_Cached_Mem_Pool_Node
{
@@ -114,8 +115,8 @@ public:
ACE_Allocator_Adapter (LPCTSTR pool_name = 0);
ACE_Allocator_Adapter (LPCTSTR pool_name,
- LPCTSTR lock_name,
- MEMORY_POOL_OPTIONS options = 0)
+ LPCTSTR lock_name,
+ MEMORY_POOL_OPTIONS options = 0)
: allocator_ (pool_name, lock_name, options)
{
ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
@@ -264,8 +265,8 @@ public:
// name (if necessary).
ACE_Malloc (LPCTSTR pool_name,
- LPCTSTR lock_name,
- const ACE_MEM_POOL_OPTIONS *options = 0);
+ LPCTSTR lock_name,
+ const ACE_MEM_POOL_OPTIONS *options = 0);
// Initialize ACE_Malloc. This constructor passes <pool_name> to
// initialize the memory pool, and uses <lock_name> to automatically
// extract out the name used for the underlying lock name (if
@@ -274,8 +275,8 @@ public:
#if !defined (ACE_HAS_TEMPLATE_TYPEDEFS)
ACE_Malloc (LPCTSTR pool_name,
- LPCTSTR lock_name,
- const void *options = 0);
+ LPCTSTR lock_name,
+ const void *options = 0);
// This is necessary to work around template bugs with certain C++
// compilers.
#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */