summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2001-01-14 16:08:31 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2001-01-14 16:08:31 +0000
commit014e89200e8ca020d460096802f1ac0993151c93 (patch)
tree426c0d3c5fd5b2a4e11c7ad9e08a66ed5ef32840
parent9b6c3058a50ad1fb603b6bea39a69d3388833ade (diff)
downloadATCD-014e89200e8ca020d460096802f1ac0993151c93.tar.gz
ChangeLogTag:Fri Jan 12 20:46:05 2001 Angelo Corsaro <corsaro@cs.wustl.edu>
-rw-r--r--THANKS8
-rw-r--r--ace/Malloc_T.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/THANKS b/THANKS
index a20d642b003..0ee9371e513 100644
--- a/THANKS
+++ b/THANKS
@@ -1124,10 +1124,10 @@ Edwin McKay <mckayea@betalasermike.com>
Scott Bolin <scott.bolin@pgs.com>
I would particularly like to thank Paul Stephenson, who worked with me
-at Ericsson. Paul devised the recursive Makefile scheme that
-underlies this distribution and also spent countless hours with me
-discussing object-oriented techniques for developing distributed
-application frameworks.
+at Ericsson in the early 1990's. Paul devised the recursive Makefile
+scheme that underlies this distribution and also spent countless hours
+with me discussing object-oriented techniques for developing
+distributed application frameworks.
Finally, I'd also like to thank Todd L. Montgomery <tmont@cs.wvu.edu>,
fellow heavy metal head, for fulfilling his quest to get ACE to
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp
index 8b1b27d3dd0..32678f014d0 100644
--- a/ace/Malloc_T.cpp
+++ b/ace/Malloc_T.cpp
@@ -246,8 +246,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p
template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *pool_name,
- const ACE_TCHAR *lock_name,
- const ACE_MEM_POOL_OPTIONS *options)
+ const ACE_TCHAR *lock_name,
+ const ACE_MEM_POOL_OPTIONS *options)
: memory_pool_ (pool_name, options),
lock_ (lock_name != 0 ? lock_name : ACE::basename (pool_name,
ACE_DIRECTORY_SEPARATOR_CHAR))