summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2004-02-06 11:39:51 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2004-02-06 11:39:51 +0000
commitbddbfeecf3b7c72724ed61cfad4267ae9dd67a6f (patch)
treea066c15bb61077ada42649e85d721f0ce56a4782
parent6aa84c898a21634dc8864212c274b806ff4093da (diff)
downloadATCD-bddbfeecf3b7c72724ed61cfad4267ae9dd67a6f.tar.gz
ChangeLogTag: Fri Feb 6 11:37:13 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h2
3 files changed, 10 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a047edd788f..7e1839745ac 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 6 11:37:13 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * performance-tests/POA/Demux/demux_test_server.h:
+ Fixed include path
+
Thu Feb 5 12:24:24 2004 Chad Elliott <elliott_c@ociweb.com>
* performance-tests/Sequence_Latency/AMI/ami.mpc:
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index 57c31d8c4ca..4ebd1ce8f4d 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -2,19 +2,18 @@
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
-#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
-#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h"
/// include this file to statically linked with FT ORB
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
/// include this file to statically linked with Transaction Depth
-#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
ACE_RCSID (Gateway_Service,
FTRTEC_Gateway_Service,
"$Id$")
-
namespace {
CORBA::ORB_var orb;
FtRtecEventChannelAdmin::EventChannel_var ftec;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index 3f9ae599e2b..ec531c6db41 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -31,7 +31,7 @@ namespace TAO
/////////////////////////////////
// Includes needed by this header
#include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
#include "ace/Hash_Map_Manager.h"
#include "ace/SString.h"
#include "ace/Null_Mutex.h"