summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/examples/Notify
diff options
context:
space:
mode:
authorboris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-07-14 07:53:09 +0000
committerboris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-07-14 07:53:09 +0000
commit6de75e7d37e65370be05f8ee39ae925db819fe46 (patch)
tree3993afe2ed85ed13666d56c1ae70c9a185f3c86e /TAO/orbsvcs/examples/Notify
parentea455e2825ab89757b8173d7ee7cffcca4a788b9 (diff)
downloadATCD-6de75e7d37e65370be05f8ee39ae925db819fe46.tar.gz
ChangeLogTag:Thu Jul 14 09:37:54 2005 Boris Kolpackov <boris@kolpackov.net>
Diffstat (limited to 'TAO/orbsvcs/examples/Notify')
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp26
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp26
2 files changed, 30 insertions, 22 deletions
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
index f0b83d61013..092ae039fcb 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
@@ -5,23 +5,23 @@
#include <iostream>
#include <sstream>
-#include <ace/OS.h>
+#include "ace/OS.h"
-#include <tao/corba.h>
+#include "tao/corba.h"
-#include <orbsvcs/CosNotificationC.h>
-#include <orbsvcs/CosNotifyChannelAdminC.h>
-#include <orbsvcs/CosNotifyCommC.h>
-#include <orbsvcs/CosNotifyCommS.h>
+#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/CosNotifyCommS.h"
// For in-process Notification Service.
//
-#include <ace/Dynamic_Service.h>
-#include <orbsvcs/Notify/Service.h>
-#include <orbsvcs/Notify/CosNotify_Initializer.h> // NS static link helper.
+#include "ace/Dynamic_Service.h"
+#include "orbsvcs/Notify/Service.h"
+#include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper.
-#include <Gate/Gate.h>
+#include "Gate/Gate.h"
using std::cerr;
using std::endl;
@@ -206,7 +206,11 @@ main (int argc, char* argv[])
// Activate the root POA.
//
- CORBA::Object_var obj (orb->resolve_initial_references ("RootPOA"));
+ CORBA::Object_var obj (
+ orb->resolve_initial_references ("RootPOA"
+ ACE_ENV_ARG_PARAMETER));
+ ACE_TRY_CHECK;
+
PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ()));
PortableServer::POAManager_var poa_manager (root_poa->the_POAManager ());
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
index c0c67c196dd..8dec6bb2b52 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
@@ -5,23 +5,23 @@
#include <iostream>
#include <sstream>
-#include <ace/OS.h>
+#include "ace/OS.h"
-#include <tao/corba.h>
+#include "tao/corba.h"
-#include <orbsvcs/CosNotificationC.h>
-#include <orbsvcs/CosNotifyChannelAdminC.h>
-#include <orbsvcs/CosNotifyCommC.h>
-#include <orbsvcs/CosNotifyCommS.h>
+#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/CosNotifyCommS.h"
// For in-process Notification Service.
//
-#include <ace/Dynamic_Service.h>
-#include <orbsvcs/Notify/Service.h>
-#include <orbsvcs/Notify/CosNotify_Initializer.h> // NS static link helper.
+#include "ace/Dynamic_Service.h"
+#include "orbsvcs/Notify/Service.h"
+#include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper.
-#include <Gate/Gate.h>
+#include "Gate/Gate.h"
using std::cerr;
using std::endl;
@@ -49,7 +49,11 @@ main (int argc, char* argv[])
// Activate the root POA.
//
- CORBA::Object_var obj (orb->resolve_initial_references ("RootPOA"));
+ CORBA::Object_var obj (
+ orb->resolve_initial_references ("RootPOA"
+ ACE_ENV_ARG_PARAMETER));
+ ACE_TRY_CHECK;
+
PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ()));
PortableServer::POAManager_var poa_manager (root_poa->the_POAManager ());