diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-28 12:35:17 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-28 12:35:17 +0000 |
| commit | d9fd99e8a0817d91d8584deb3f561a59824b3057 (patch) | |
| tree | 6149b6fdb9312e4cff93e6dcda87095290b176cb | |
| parent | 19eabb9ed40d80a4ff25ac8b6a3e7b109f044ca9 (diff) | |
| download | ATCD-d9fd99e8a0817d91d8584deb3f561a59824b3057.tar.gz | |
Wed Sep 28 12:34:31 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Bug_3683_Regression/Echo_i.h:
Remove workaround
* tests/IDL_Test/typedef.idl:
* tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h:
Layout changes
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tests/Bug_3683_Regression/Echo_i.h | 3 | ||||
| -rw-r--r-- | TAO/tests/IDL_Test/typedef.idl | 4 | ||||
| -rw-r--r-- | TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h | 3 |
4 files changed, 14 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index faaa382dfd9..526a56d1b22 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Wed Sep 28 12:34:31 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_3683_Regression/Echo_i.h: + Remove workaround + + * tests/IDL_Test/typedef.idl: + * tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h: + Layout changes + Wed Sep 28 12:31:44 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * tests/HandleExhaustion/run_test.pl: diff --git a/TAO/tests/Bug_3683_Regression/Echo_i.h b/TAO/tests/Bug_3683_Regression/Echo_i.h index 5afd29de0b1..f626d509794 100644 --- a/TAO/tests/Bug_3683_Regression/Echo_i.h +++ b/TAO/tests/Bug_3683_Regression/Echo_i.h @@ -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/tests/IDL_Test/typedef.idl b/TAO/tests/IDL_Test/typedef.idl index 5385c5ef936..ee2493ce3e8 100644 --- a/TAO/tests/IDL_Test/typedef.idl +++ b/TAO/tests/IDL_Test/typedef.idl @@ -44,7 +44,7 @@ typedef TAO_V5 TAO_Z5[5]; // typedef has a unique #ifndef guard. module TestModule { - typedef string<32> typedef_1; + typedef string<32> typedef_1; typedef string<32> typedef_2; interface TestInterface @@ -120,3 +120,5 @@ module CommaList + + diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h index 6e4d005d9e5..6149b7f5dd4 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h @@ -24,8 +24,7 @@ class MY_Stub_Export Smart_Diamond_Top_Proxy : public virtual Diamond::TAO_Diamo Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy); - virtual char * shape () -; + virtual char * shape (); // Smartify the method call! // Dont need to add any extra functionality into shutdown() |