summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2013-09-16 16:33:45 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2013-09-16 16:33:45 +0000
commit13ba6b466095def7f4ab0b642a6fb6a39d42e0e7 (patch)
treee726c927102a516167b9c21fb3ffb19e6fc49159
parent56bc089b171e6dd7451816464d141a1951a08b0b (diff)
downloadATCD-13ba6b466095def7f4ab0b642a6fb6a39d42e0e7.tar.gz
Mon Sep 16 16:33:46 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* TAO-INSTALL.html: ACE_ROOT and TAO_ROOT are mandatory, for example MPC can't run without TAO_ROOT * tests/Bug_2734_Regression/client.cpp: Zapped a lot of empty lines
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/TAO-INSTALL.html4
-rw-r--r--TAO/tests/Bug_2734_Regression/client.cpp15
3 files changed, 11 insertions, 17 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c7f705ffbd2..bd183136a07 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Mon Sep 16 16:33:46 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * TAO-INSTALL.html:
+ ACE_ROOT and TAO_ROOT are mandatory, for example MPC can't
+ run without TAO_ROOT
+
+ * tests/Bug_2734_Regression/client.cpp:
+ Zapped a lot of empty lines
+
Wed Sep 11 07:50:52 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/tao_orb_tests.lst:
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 3991b2080a4..5da09fd3d6f 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -380,10 +380,10 @@ environment variables are set on the machine to override the
built-in settings. More information about these environment variables can
be found in the <a href="docs/compiler.html#idl_env">TAO_IDL documentation.</a></P>
-<P>It is also advisable to set either the <CODE>ACE_ROOT</CODE> environment
+<P>It is also mandatory to set the <CODE>ACE_ROOT</CODE> environment
variable as outlined in the
<a href="../ACE/ACE-INSTALL.html">ACE
-installation notes</A> or the <code>TAO_ROOT</code> environment variable.
+installation notes</A> and the <code>TAO_ROOT</code> environment variable.
</P>
Remember to <a href="../ACE/ACE-INSTALL.html">set
diff --git a/TAO/tests/Bug_2734_Regression/client.cpp b/TAO/tests/Bug_2734_Regression/client.cpp
index a5b94214917..22c22bab1d5 100644
--- a/TAO/tests/Bug_2734_Regression/client.cpp
+++ b/TAO/tests/Bug_2734_Regression/client.cpp
@@ -165,9 +165,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
send_echo (none, orb.in (), server.in (), t);
-
-
-
ACE_DEBUG ((LM_DEBUG,
"client(%P) Set the ORB policies\n"));
@@ -183,12 +180,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
policy_list[0]->destroy ();
-
-
-
-
-
-
ACE_DEBUG ((LM_DEBUG,
"client(%P) Set the thread policies\n"));
@@ -204,12 +195,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
policy_list[0]->destroy ();
-
-
-
-
-
-
ACE_DEBUG ((LM_DEBUG,
"client(%P) Use the object policies\n"));
send_echo (object1, orb.in (), timeout_server.in (), t);