diff options
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/ace/Timer_Queue_T.cpp | 2 | ||||
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc | 3 | ||||
| -rw-r--r-- | TAO/examples/Advanced/ch_8_and_10/icp.h | 4 | ||||
| -rw-r--r-- | TAO/examples/Advanced/ch_8_and_10/server.h | 2 |
6 files changed, 21 insertions, 4 deletions
diff --git a/ACE/THANKS b/ACE/THANKS index 597d183147b..69effbd6edd 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2276,6 +2276,7 @@ Jesus Martinez <jmcruz at lcc dot uma dot es> Martin Gaus <Gaus at gmx dot de> Steve Stallion <stallions at ociweb dot com> Ron van Hoof <rvhoof27 at gmail dot com> +Joe Lihn <joelihn at hotmail dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp index 4643090ecd5..2ac9a29e9aa 100644 --- a/ACE/ace/Timer_Queue_T.cpp +++ b/ACE/ace/Timer_Queue_T.cpp @@ -166,7 +166,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Queue_T (FUNCTOR *upcall_functor, - ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) + ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist) : gettimeofday_ (ACE_OS::gettimeofday), delete_upcall_functor_ (upcall_functor == 0), delete_free_list_ (freelist == 0), diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d5f27d9cdf6..a222dc81f8e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Tue Feb 10 02:48:01 UTC 2009 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc: Added + + libs += TAO_PortableServer + + * examples/Advanced/ch_8_and_10/icp.h: Added #include for "ace/OS.h". + + * examples/Advanced/ch_8_and_10/server.h: Zapped a stray ')'. + + Thanks to Joe Lihn <joelihn at hotmail dot com> for reporting + these problems and providing the fixes. + Wed Feb 11 14:15:28 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Leader_Follower.cpp: diff --git a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc index a82b9ef5d2f..85bc8339a52 100644 --- a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc +++ b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc @@ -10,8 +10,11 @@ project(*client) : taoclient { project(*server) : taoserver { requires += dummy_label + libs += TAO_PortableServer source_files { server.cpp icp.cpp } } + + diff --git a/TAO/examples/Advanced/ch_8_and_10/icp.h b/TAO/examples/Advanced/ch_8_and_10/icp.h index f0a53a748ab..795e527e0b6 100644 --- a/TAO/examples/Advanced/ch_8_and_10/icp.h +++ b/TAO/examples/Advanced/ch_8_and_10/icp.h @@ -17,11 +17,11 @@ // // ============================================================================ - - #ifndef _ICP_H #define _ICP_H +#include "ace/OS.h" + extern "C" { int ICP_online(unsigned long id); // Add device int ICP_offline(unsigned long id); // Remove device diff --git a/TAO/examples/Advanced/ch_8_and_10/server.h b/TAO/examples/Advanced/ch_8_and_10/server.h index 51cf9717fb8..aa353e97b44 100644 --- a/TAO/examples/Advanced/ch_8_and_10/server.h +++ b/TAO/examples/Advanced/ch_8_and_10/server.h @@ -68,7 +68,7 @@ class Thermostat_impl : public: // CORBA operations virtual CCS::TempType get_nominal(); - virtual CCS::TempType set_nominal(CCS::TempType new_temp)); + virtual CCS::TempType set_nominal(CCS::TempType new_temp); // Constructor and destructor Thermostat_impl( |