diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-28 12:37:43 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-28 12:37:43 +0000 |
commit | 9449d1e80219f286db2ef2b045400912fd86f320 (patch) | |
tree | 47fb7c6772b523652983c51a9591648cb004576f | |
parent | ca62521d7785ba0e168af04a79f7f6ce1b0297cf (diff) | |
download | ATCD-9449d1e80219f286db2ef2b045400912fd86f320.tar.gz |
Wed Sep 28 12:37:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/Persistent_Grid/Grid_i.h:
* examples/Simple/bank/AccountManager_i.h:
* examples/Simple/echo/Echo_i.h:
* examples/Simple/grid/Grid_i.h:
* examples/Simple/time/Time_i.h:
Layout changes, remove workarounds
-rw-r--r-- | TAO/ChangeLog | 9 | ||||
-rw-r--r-- | TAO/examples/Persistent_Grid/Grid_i.h | 10 | ||||
-rw-r--r-- | TAO/examples/Simple/bank/AccountManager_i.h | 3 | ||||
-rw-r--r-- | TAO/examples/Simple/echo/Echo_i.h | 5 | ||||
-rw-r--r-- | TAO/examples/Simple/grid/Grid_i.h | 3 | ||||
-rw-r--r-- | TAO/examples/Simple/time/Time_i.h | 3 |
6 files changed, 17 insertions, 16 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 899d95000ef..98b1705b468 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Wed Sep 28 12:37:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Persistent_Grid/Grid_i.h: + * examples/Simple/bank/AccountManager_i.h: + * examples/Simple/echo/Echo_i.h: + * examples/Simple/grid/Grid_i.h: + * examples/Simple/time/Time_i.h: + Layout changes, remove workarounds + Wed Sep 28 12:35:58 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp: diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h index 31c3a766303..9a52fa905a3 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.h +++ b/TAO/examples/Persistent_Grid/Grid_i.h @@ -66,8 +66,7 @@ private: /// Hold the pool of name pool_name_ pool_t *pool_t_; - /// Keeping g++2.7.2 - ACE_UNIMPLEMENTED_FUNC (void operator= (const Grid_Factory_i &)) + void operator= (const Grid_Factory_i &); }; @@ -86,11 +85,8 @@ public: /// Constructor Grid_i (void); - Grid_i (CORBA::Short, - CORBA::Short, - pool_t *); - - // Constructor. + /// Constructor. + Grid_i (CORBA::Short, CORBA::Short, pool_t *); /// Destructor ~Grid_i (void); diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h index ede279c0840..efbc16168f8 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.h +++ b/TAO/examples/Simple/bank/AccountManager_i.h @@ -96,8 +96,7 @@ private: */ MAP_MANAGER_TYPE hash_map_; - /// Keeping g++2.7.2 - ACE_UNIMPLEMENTED_FUNC (void operator= (const AccountManager_i &)) + void operator= (const AccountManager_i &) }; #endif /* ACCOUNTMANAGER_I_H */ diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h index 5afd29de0b1..6211b8ed499 100644 --- a/TAO/examples/Simple/echo/Echo_i.h +++ b/TAO/examples/Simple/echo/Echo_i.h @@ -24,7 +24,7 @@ * * @brief Echo Object Implementation * - * The object implementation performs teh following functions: + * The object implementation performs the following functions: * -- To return the string which needs to be displayed * from the server. * -- shuts down the server @@ -55,8 +55,7 @@ private: /// ORB pointer. CORBA::ORB_var orb_; - /// Keeping g++ 2.7.2 happy.. - ACE_UNIMPLEMENTED_FUNC (void operator= (const Echo_i&)) + void operator= (const Echo_i&); }; #endif /* ECHO_I_H */ diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h index 72166422d8a..7b9f581735a 100644 --- a/TAO/examples/Simple/grid/Grid_i.h +++ b/TAO/examples/Simple/grid/Grid_i.h @@ -116,8 +116,7 @@ private: /// ORB pointer. CORBA::ORB_var orb_; - /// Keeping g++2.7.2 - ACE_UNIMPLEMENTED_FUNC (void operator= (const Grid_Factory_i &)) + void operator= (const Grid_Factory_i &); }; #endif /* GRID_I_H */ diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h index 2260d52a185..d97c0937fa0 100644 --- a/TAO/examples/Simple/time/Time_i.h +++ b/TAO/examples/Simple/time/Time_i.h @@ -51,8 +51,7 @@ private: /// ORB pointer. CORBA::ORB_var orb_; - /// Keeping g++2.7.2 - ACE_UNIMPLEMENTED_FUNC (void operator= (const Time_i &)) + void operator= (const Time_i &); }; #endif /* TIME_I_H */ |