summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2001-07-29 17:54:03 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2001-07-29 17:54:03 +0000
commit71af32cbffa037e4e763be7de6dbcaaa14878837 (patch)
tree0e2d9faa6b15462f7139e912c73e5dd5d89d3e5f
parenta7325548268d58fa36eb9deeaf5712836dec7b82 (diff)
downloadATCD-71af32cbffa037e4e763be7de6dbcaaa14878837.tar.gz
ChangeLogTag:Sun Jul 29 10:50:45 2001 Ossama Othman <ossama@uci.edu>
-rw-r--r--ChangeLog12
-rw-r--r--ChangeLogs/ChangeLog-02a12
-rw-r--r--ChangeLogs/ChangeLog-03a12
-rw-r--r--ace/Service_Config.cpp1
-rw-r--r--ace/Svc_Conf_Lexer_Guard.cpp1
5 files changed, 37 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f2d3f97907..5b9a0e83d93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sun Jul 29 10:50:45 2001 Ossama Othman <ossama@uci.edu>
+
+ * ace/Svc_Conf_Lexer_Guard.cpp:
+
+ There is no longer any need to include "ace/Object_Manager.h"
+
+ * ace/Service_Config.cpp:
+
+ Include "ace/Object_Manager.h" to pull in the definition of
+ ACE_Static_Object_Lock. Fixes a problem found in Sun builds and
+ single-threaded builds.
+
Sat Jul 28 23:03:24 2001 Ossama Othman <ossama@uci.edu>
The following are changes that make the Service Configurator
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 5f2d3f97907..5b9a0e83d93 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Sun Jul 29 10:50:45 2001 Ossama Othman <ossama@uci.edu>
+
+ * ace/Svc_Conf_Lexer_Guard.cpp:
+
+ There is no longer any need to include "ace/Object_Manager.h"
+
+ * ace/Service_Config.cpp:
+
+ Include "ace/Object_Manager.h" to pull in the definition of
+ ACE_Static_Object_Lock. Fixes a problem found in Sun builds and
+ single-threaded builds.
+
Sat Jul 28 23:03:24 2001 Ossama Othman <ossama@uci.edu>
The following are changes that make the Service Configurator
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 5f2d3f97907..5b9a0e83d93 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Sun Jul 29 10:50:45 2001 Ossama Othman <ossama@uci.edu>
+
+ * ace/Svc_Conf_Lexer_Guard.cpp:
+
+ There is no longer any need to include "ace/Object_Manager.h"
+
+ * ace/Service_Config.cpp:
+
+ Include "ace/Object_Manager.h" to pull in the definition of
+ ACE_Static_Object_Lock. Fixes a problem found in Sun builds and
+ single-threaded builds.
+
Sat Jul 28 23:03:24 2001 Ossama Othman <ossama@uci.edu>
The following are changes that make the Service Configurator
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 62f020f6fff..6674ff65597 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -12,6 +12,7 @@
#include "ace/Auto_Ptr.h"
#include "ace/Reactor.h"
#include "ace/Thread_Manager.h"
+#include "ace/Object_Manager.h"
#include "ace/Service_Config.h"
diff --git a/ace/Svc_Conf_Lexer_Guard.cpp b/ace/Svc_Conf_Lexer_Guard.cpp
index 740804eff83..91724882ef7 100644
--- a/ace/Svc_Conf_Lexer_Guard.cpp
+++ b/ace/Svc_Conf_Lexer_Guard.cpp
@@ -1,7 +1,6 @@
// -*- C++ -*-
#include "ace/Svc_Conf.h"
-#include "ace/Object_Manager.h"
#include "ace/Svc_Conf_Lexer_Guard.h"