summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-02-06 01:01:37 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-02-06 01:01:37 +0000
commite3979fd314dce1bfc600e14e79794988ac0f87b6 (patch)
tree1a2adb7e132191dd460e7f7a39dd411da309dc6b
parent4b9f1e6fca9e757e15cc2ff083b6977eab92625a (diff)
downloadATCD-e3979fd314dce1bfc600e14e79794988ac0f87b6.tar.gz
Mon Feb 6 01:00:55 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>
-rw-r--r--apps/JAWS/ChangeLog7
-rw-r--r--apps/JAWS/server/HTTP_Server.h2
2 files changed, 9 insertions, 0 deletions
diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog
index 6d384b3031b..11d67ef52cd 100644
--- a/apps/JAWS/ChangeLog
+++ b/apps/JAWS/ChangeLog
@@ -1,3 +1,10 @@
+Mon Feb 6 01:00:55 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>
+
+ * server/HTTP_Server.h
+
+ Surrounded a proactor forward declaration with versioned
+ namespace macros.
+
Thu Jan 5 00:42:28 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
* ChangeLog:
diff --git a/apps/JAWS/server/HTTP_Server.h b/apps/JAWS/server/HTTP_Server.h
index 786108f658d..9e8534c4cbd 100644
--- a/apps/JAWS/server/HTTP_Server.h
+++ b/apps/JAWS/server/HTTP_Server.h
@@ -35,8 +35,10 @@
#include "ace/Null_Mutex.h"
#include "ace/Global_Macros.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Forward declaration.
class ACE_Proactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
#if defined (ACE_HAS_THREAD_SAFE_ACCEPT)
typedef ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_NULL_MUTEX> HTTP_SOCK_Acceptor;