summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-10-20 10:15:26 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-10-20 10:15:26 +0000
commite54164b2ab8b2ee14d3236fd938e47cfea1bad18 (patch)
tree1374576ef10bf0fb929d116f2b2d75368455560e
parent9a2540274ac7ab8a1ba6af2b6c8a474665747897 (diff)
downloadATCD-e54164b2ab8b2ee14d3236fd938e47cfea1bad18.tar.gz
Fixed fuzz
-rw-r--r--TAO/tests/Bug_2241_Regression/README2
-rw-r--r--TAO/tests/Collocated_Best/README3
-rw-r--r--TAO/tests/Collocated_DerivedIF/Hello.cpp4
-rw-r--r--TAO/tests/Collocated_DerivedIF/Test.idl4
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp2
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl4
6 files changed, 8 insertions, 11 deletions
diff --git a/TAO/tests/Bug_2241_Regression/README b/TAO/tests/Bug_2241_Regression/README
index d865dd156e6..f1822ea4262 100644
--- a/TAO/tests/Bug_2241_Regression/README
+++ b/TAO/tests/Bug_2241_Regression/README
@@ -1,3 +1,5 @@
+// $Id$
+
This test is build without idlflag -Gd, so Direct collocation isn't enabled.
Running this test with -ORBCollocationStrategy 'direct' should result in an Exception.
diff --git a/TAO/tests/Collocated_Best/README b/TAO/tests/Collocated_Best/README
index 6abd103bbe4..8e436ff63d7 100644
--- a/TAO/tests/Collocated_Best/README
+++ b/TAO/tests/Collocated_Best/README
@@ -1,11 +1,12 @@
// $Id$
+
CollocationStrategy TAO_COLLOCATION_BEST:
This tests performs a series of checks on CollocationStrategy 'best' (TAO_COLLOCATION_BEST) support in TAO.
With CollocationStrategy 'best' the best possible collocation strategy is tried to perform.
If TAO_COLLOCATION_DIRECT is possible, this has to be used, else if TAO_COLLOCATION_THRU_POA
- is possible this has to be used, else use remote stub.
+ is possible this has to be used, else use remote stub.
The test Collocated_Best_Direct uses IDLflags -Sp, to disable Thru_poa collocation
and -Gd, to enable Direct collocation.
diff --git a/TAO/tests/Collocated_DerivedIF/Hello.cpp b/TAO/tests/Collocated_DerivedIF/Hello.cpp
index 1db920f42f5..cfe8449e8f6 100644
--- a/TAO/tests/Collocated_DerivedIF/Hello.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Hello.cpp
@@ -1,12 +1,10 @@
-//
// $Id$
-//
+
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
#include "tao/ORB_Core_Auto_Ptr.h"
-
HelloAgain::HelloAgain (CORBA::ORB_ptr orb,
ACE_thread_t thrid)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Collocated_DerivedIF/Test.idl b/TAO/tests/Collocated_DerivedIF/Test.idl
index 001c6e274a2..b0eef86c20b 100644
--- a/TAO/tests/Collocated_DerivedIF/Test.idl
+++ b/TAO/tests/Collocated_DerivedIF/Test.idl
@@ -1,6 +1,4 @@
-//
// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
@@ -18,6 +16,6 @@ module Test
// A derived interface
interface HelloAgain : Hello
{
- string get_string_again ();
+ string get_string_again ();
};
};
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
index 2bde4bbba67..f4da4cce531 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
@@ -1,6 +1,4 @@
-//
// $Id$
-//
#include "Client_Task.h"
#include "testC.h"
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl
index 687502ce8f9..99a913cf6f0 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl
@@ -4,10 +4,10 @@ interface test
{
/// Return a simple string
string get_string ();
-
+
void method ();
// A twoway operation.
-
+
void shutdown ();
// Shutdown the server.
};