diff options
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 8 | ||||
-rw-r--r-- | TAO/examples/Advanced/TO-DO | 24 | ||||
-rw-r--r-- | TAO/examples/Advanced/ch_21/client.cpp | 3 | ||||
-rw-r--r-- | TAO/examples/Quoter/Quoter_i.cpp | 6 | ||||
-rw-r--r-- | TAO/examples/Simple/bank/README | 5 |
5 files changed, 22 insertions, 24 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 82819a7a47b..b52fc5135df 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Jun 29 12:44:21 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Advanced/TO-DO: + * examples/Advanced/ch_21/client.cpp: + * examples/Quoter/Quoter_i.cpp: + * examples/Simple/bank/README: + Cleanup + Wed Jun 29 11:27:19 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * tests/OBV/Simple/Client_i.h: diff --git a/TAO/examples/Advanced/TO-DO b/TAO/examples/Advanced/TO-DO index 796b748509c..76d0b1fbc55 100644 --- a/TAO/examples/Advanced/TO-DO +++ b/TAO/examples/Advanced/TO-DO @@ -1,28 +1,26 @@ $Id$ ______________________________________________________________________________ -This is a 'To Do' list for the TAO versions of the Henning and Vinoski +This is a 'To Do' list for the TAO versions of the Henning and Vinoski examples ($TAO_ROOT/examples/Advanced). It is an ongoing effort to get -these examples working with TAO, 'out of the box' with as few changes as -possible. If you'd like to help or have additional problems to report +these examples working with TAO, 'out of the box' with as few changes as +possible. If you'd like to help or have additional problems to report please coordinate with Mike Moran <mm4@cs.wustl.edu>. -All changes which have been made over the original code distribution have -been documented in CHANGES files in each examples directory. Please keep +All changes which have been made over the original code distribution have +been documented in CHANGES files in each examples directory. Please keep these files up-to-date. ______________________________________________________________________________ - Chapter 19's example throws exceptions at runtime. -- run_tests.pl in ch_3/, ch8_and_10/, ch_12/, and ch_21 do not work on Win32. - These tests need to redirect stdout of the server to a file, and maintain a - reference to the process so that the server can killed at the end of the +- run_tests.pl in ch_3/, ch8_and_10/, ch_12/, and ch_21 do not work on Win32. + These tests need to redirect stdout of the server to a file, and maintain a + reference to the process so that the server can killed at the end of the script. -- Some examples need .dsw files - -- Instances of fstream.close() and related error detection have been - commented-out in all examples 12 and higher. This code needs to be +- Instances of fstream.close() and related error detection have been + commented-out in all examples 12 and higher. This code needs to be reinstated. - Chapters 8 and above do not work with MS Visual Studio. possibly due to @@ -30,7 +28,7 @@ ______________________________________________________________________________ - We could use a better test for the multitheraded server in ch_21. -- Do more testing on various platforms and compilers. These so far only +- Do more testing on various platforms and compilers. These so far only Solaris 7, Linux and Windows NT have been used. diff --git a/TAO/examples/Advanced/ch_21/client.cpp b/TAO/examples/Advanced/ch_21/client.cpp index cc9db916187..eda65f7c518 100644 --- a/TAO/examples/Advanced/ch_21/client.cpp +++ b/TAO/examples/Advanced/ch_21/client.cpp @@ -5,14 +5,13 @@ * * $Id$ * - * @author Source code used in TAO has been modified and adapted from the codeprovided in the book + * @author Source code used in TAO has been modified and adapted from the code provided in the book * @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley * @author Reading * @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu> */ //============================================================================= - #include "CCSC.h" // ORB-specific #include <ace/streams.h> diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp index 60f0b808739..73597fd685b 100644 --- a/TAO/examples/Quoter/Quoter_i.cpp +++ b/TAO/examples/Quoter/Quoter_i.cpp @@ -126,8 +126,7 @@ Quoter_i::get_quote (char const *) CosLifeCycle::LifeCycleObject_ptr Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there, - const CosLifeCycle::Criteria &/*the_criteria*/ - ) + const CosLifeCycle::Criteria &/*the_criteria*/) { const char *exception_message = "Null message"; CosLifeCycle::LifeCycleObject_ptr lifeCycleObject_ptr = @@ -239,8 +238,7 @@ Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there, void Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, - const CosLifeCycle::Criteria & /* the_criteria */ - ) + const CosLifeCycle::Criteria & /* the_criteria */) { ACE_ERROR ((LM_ERROR, "Quoter_i::move: The Quoter object is not movable!")); diff --git a/TAO/examples/Simple/bank/README b/TAO/examples/Simple/bank/README index 7fc2d09e31e..15620728260 100644 --- a/TAO/examples/Simple/bank/README +++ b/TAO/examples/Simple/bank/README @@ -107,8 +107,3 @@ The client executes the following tests : more than the current balance. The server throws an exception which is passed to the client and the client displays the reason for the exception. - - - - - |