diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-24 16:58:05 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-24 16:58:05 +0000 |
| commit | 1287ffe95507bed7bfbc9988633d372821cec10b (patch) | |
| tree | badd21bfc76db3ba8482e515c6fefc7aae8c22f4 | |
| parent | dd349cbd69cf26fe6516eeb5761423f5947ba0ef (diff) | |
| download | ATCD-1287ffe95507bed7bfbc9988633d372821cec10b.tar.gz | |
ChangeLogTag: Wed Feb 24 16:53:55 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 13 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_scope.cpp | 4 |
3 files changed, 22 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index fe66a253ab1..2edd4c4b675 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Wed Feb 24 16:53:55 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/util/utl_scope.cpp: + + Fixed bug introduced by consolidation of fe_add_* + methods for exceptions. + + * TAO_IDL/be/be_codegen.cpp: + + Fixed compile error on MacOSX due to inappropriate + C++-style cast. + Wed Feb 24 16:29:51 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> * tests/Bug_3826_Regression/svc.conf: diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index e1762e4d15e..d81340eb063 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -3391,18 +3391,19 @@ TAO_CodeGen::make_rand_extension (char * const t) { size_t const NUM_CHARS = ACE_OS::strlen (t); - // Use ACE_Time_Value::msec(ACE_UINT64&) as opposed to - // ACE_Time_Value::msec(void) to avoid truncation. + /// Use ACE_Time_Value::msec(ACE_UINT64&) as opposed to + /// ACE_Time_Value::msec(void) to avoid truncation. ACE_UINT64 msec; - // Use a const ACE_Time_Value to resolve ambiguity between - // ACE_Time_Value::msec (long) and ACE_Time_Value::msec(ACE_UINT64&) const. + /// Use a const ACE_Time_Value to resolve ambiguity between + /// ACE_Time_Value::msec (long) and ACE_Time_Value::msec(ACE_UINT64&) const. ACE_Time_Value const now = ACE_OS::gettimeofday (); now.msec (msec); - // Add the process and thread ids to ensure uniqueness. + /// Add the process and thread ids to ensure uniqueness. Must use + // C-style cast, since thr_self() returns a pointer on some platforms. msec += ACE_OS::getpid (); - msec += static_cast<size_t> (ACE_OS::thr_self ()); + msec += (size_t) ACE_OS::thr_self (); // ACE_thread_t may be a char* (returned by ACE_OS::thr_self()) so // we need to use a C-style cast as a catch-all in order to use a diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index bdc5e59ccc4..84305c6222a 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -514,7 +514,9 @@ UTL_Scope::fe_add_full_struct_type (AST_Structure *t) /// Decls inside a struct or union are also referenced by /// fields, and so must be handled differently. - if (nt == AST_Decl::NT_struct || nt == AST_Decl::NT_union) + if (nt == AST_Decl::NT_struct + || nt == AST_Decl::NT_union + || nt == AST_Decl::NT_except) { this->add_to_local_types (t); } |