summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-03-28 16:14:21 +0000
committeriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-03-28 16:14:21 +0000
commit9df46580e1ffe91f6dfed1f51a1f937741879125 (patch)
treedb0febf3406c801d7b0f28984ad9bfe2a543d456
parent179d29290e3da2d236875585229ba3599abbcbd5 (diff)
downloadATCD-9df46580e1ffe91f6dfed1f51a1f937741879125.tar.gz
ChangeLogTag: Fri Mar 28 16:13:30 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
-rw-r--r--ACE/ChangeLog.iliyan-gestalt7
-rw-r--r--ACE/ace/Dynamic_Service_Base.h3
-rw-r--r--ACE/ace/Service_Gestalt.h8
3 files changed, 11 insertions, 7 deletions
diff --git a/ACE/ChangeLog.iliyan-gestalt b/ACE/ChangeLog.iliyan-gestalt
index 777b8e7d1a1..808998dc562 100644
--- a/ACE/ChangeLog.iliyan-gestalt
+++ b/ACE/ChangeLog.iliyan-gestalt
@@ -1,3 +1,10 @@
+Fri Mar 28 16:13:30 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
+
+ * ace/Dynamic_Service_Base.h:
+ * ace/Service_Gestalt.h:
+
+ Updated following a code-review.
+
Thu Mar 27 21:04:11 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
* THANKS:
diff --git a/ACE/ace/Dynamic_Service_Base.h b/ACE/ace/Dynamic_Service_Base.h
index 0a37d53971e..0c0b2e0ac41 100644
--- a/ACE/ace/Dynamic_Service_Base.h
+++ b/ACE/ace/Dynamic_Service_Base.h
@@ -24,9 +24,8 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-#include "ace/Service_Config.h"
-
class ACE_Service_Type;
+class ACE_Service_Gestalt;
/**
* @class ACE_Dynamic_Service_Base
diff --git a/ACE/ace/Service_Gestalt.h b/ACE/ace/Service_Gestalt.h
index c0bd46eb269..8952e2ffaf3 100644
--- a/ACE/ace/Service_Gestalt.h
+++ b/ACE/ace/Service_Gestalt.h
@@ -320,7 +320,8 @@ protected:
/**
*
*/
- virtual int parse_args_i (int, ACE_TCHAR *argv[], bool& ignore_default_svc_conf_file);
+ virtual int parse_args_i (int, ACE_TCHAR *argv[],
+ bool& ignore_default_svc_conf_file);
/**
* Performs an open without parsing command-line arguments. The
@@ -448,13 +449,9 @@ protected:
/// the static_svcs_ list.
ACE_PROCESSED_STATIC_SVCS* processed_static_svcs_;
- //@DEBUG:
- public:
-
/// Support for intrusive reference counting
ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> refcnt_;
-
public:
static void intrusive_add_ref (ACE_Service_Gestalt*);
static void intrusive_remove_ref (ACE_Service_Gestalt*);
@@ -495,6 +492,7 @@ private:
ACE_Service_Repository & repo_;
size_t repo_begin_;
ACE_TCHAR const * const name_;
+
# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
ACE_Guard< ACE_Recursive_Thread_Mutex > repo_monitor_;
#endif