diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-14 11:56:04 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-14 11:56:04 +0000 |
commit | 24918c102576daeb4b322e42cec71c76fec3def1 (patch) | |
tree | 3d9db411cfbc1eaacbc007049ce34b9be32e2b79 | |
parent | 3058028dfbc175175aa8d0f5be35a2f281deab5a (diff) | |
download | ATCD-24918c102576daeb4b322e42cec71c76fec3def1.tar.gz |
Thu Apr 14 11:55:01 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Resume_Handle.h:
* tao/Resume_Handle.cpp:
Layout changes
* tests/IDL_Test/IDL_Test.mpc:
Added CoreDX project
-rw-r--r-- | TAO/ChangeLog | 9 | ||||
-rw-r--r-- | TAO/tao/Resume_Handle.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/Resume_Handle.h | 1 | ||||
-rw-r--r-- | TAO/tests/IDL_Test/IDL_Test.mpc | 57 |
4 files changed, 67 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index fce06a09107..9e1ad254ba9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Apr 14 11:55:01 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Resume_Handle.h: + * tao/Resume_Handle.cpp: + Layout changes + + * tests/IDL_Test/IDL_Test.mpc: + Added CoreDX project + Tue Apr 12 18:00:33 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * tests/MT_NoUpcall_Client_Leader/server.cpp: diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp index 28fd66a49e1..06ecdc7f706 100644 --- a/TAO/tao/Resume_Handle.cpp +++ b/TAO/tao/Resume_Handle.cpp @@ -26,7 +26,7 @@ TAO_Resume_Handle::resume_handle (void) this->orb_core_->reactor ()->resume_handler (this->handle_); } - // Set the flag, so that we dont resume again.. + // Set the flag, so that we don't resume again.. this->flag_ = TAO_HANDLE_ALREADY_RESUMED; } diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h index fb12f1dd1d0..759cdca09af 100644 --- a/TAO/tao/Resume_Handle.h +++ b/TAO/tao/Resume_Handle.h @@ -48,7 +48,6 @@ class TAO_Export TAO_Resume_Handle { public: - /// Constructor. TAO_Resume_Handle (TAO_ORB_Core *orb_core = 0, ACE_HANDLE h = ACE_INVALID_HANDLE); diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc index 94879580d75..8c58bdf1d55 100644 --- a/TAO/tests/IDL_Test/IDL_Test.mpc +++ b/TAO/tests/IDL_Test/IDL_Test.mpc @@ -304,6 +304,63 @@ project(*NDDS_IDL): ndds_cck_ts_defaults { } } +project(*CoreDX_IDL): coredx_ts_defaults { + custom_only=1 + + CoreDXTypeSupport_Files { + anonymous.idl + array.idl + array_only.idl + attribute.idl + Bug_2350_Regression.idl + Bug_2577_Regression.idl + Bug_2582_Regression.idl + Bug_2583_Regression.idl + Bug_2616_Regression.idl + Bug_2619_Regression.idl + Bug_3243_Regression.idl + Bug_3312_Regression.idl + Bug_3819_Regression.idl + Bug_3821_Regression.idl + constants.idl + dif2.idl + enum_in_struct.idl + full.idl + fwd.idl + generic_object.idl + gperf.idl + included.idl + including.idl + inherit.idl + interface.idl + keywords.idl + module.idl + nested_scope.idl + old_array.idl + old_constants.idl + old_sequence.idl + old_struct.idl + old_union.idl +// old_union2.idl + params.idl + pragma.idl + primtypes.idl + reopened_modules.idl + reopen_include1.idl + reopen_include2.idl + repo_id_mod.idl + sequence.idl + simple.idl + simple2.idl + struct.idl + typecode.idl + typedef.idl + typeprefix.idl + union.idl + valuetype.idl + } +} + project(*NDDS_Lib): taolib, messaging, gen_ostream, nddslib { after += *DLL *NDDS_IDL libs += IDL_Test_DLL |