diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-08-03 14:51:04 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-08-03 14:51:04 +0000 |
| commit | 692a7f154edd08f520b4cf232eaa027d28eef825 (patch) | |
| tree | 88d494aeabb4c99e2c0c0ffa4b4aaee328629ef3 | |
| parent | 8894ed159d9235c46be81d3364e4f1e73d4d3dd4 (diff) | |
| download | ATCD-692a7f154edd08f520b4cf232eaa027d28eef825.tar.gz | |
ChangeLogTag: Tue Aug 3 14:48:42 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 15 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_argument/argument.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/Environment.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Object.inl | 2 | ||||
| -rw-r--r-- | TAO/tao/Valuetype/AbstractBase.inl | 2 |
5 files changed, 21 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 60e50be2148..26ab96973d9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,18 @@ +Tue Aug 3 14:48:42 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/Environment.cpp: + + Added Id string. + + * tao/Object.inl: + * tao/Valuetype/AbstractBase.inl: + + Replace 'inline' with 'ACE_INLINE'. + + * TAO_IDL/be/be_visitor_argument/argument.cpp: + + Added missing final newline. + Tue Aug 3 14:17:23 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> * tests/Exposed_Policies/Policy_Verifier.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp index 7bd31dbdffa..9013b758b4f 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp @@ -175,4 +175,5 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node, } return 0; -}
\ No newline at end of file +} + diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index b5f2f835b5d..421c9178ffe 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "tao/Environment.h" #include "tao/ORB_Core.h" #include "tao/SystemException.h" diff --git a/TAO/tao/Object.inl b/TAO/tao/Object.inl index c3434283af8..729c0fd0a8d 100644 --- a/TAO/tao/Object.inl +++ b/TAO/tao/Object.inl @@ -83,7 +83,7 @@ CORBA::Object::ior (void) const return this->ior_.in (); } -inline void +ACE_INLINE void CORBA::Object::_decr_refcount (void) { this->_remove_ref (); diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl index 90e033664c8..fd1a25ee008 100644 --- a/TAO/tao/Valuetype/AbstractBase.inl +++ b/TAO/tao/Valuetype/AbstractBase.inl @@ -55,7 +55,7 @@ CORBA::AbstractBase::_is_local (void) const return this->is_local_; } -inline void +ACE_INLINE void CORBA::AbstractBase::_decr_refcount (void) { this->_remove_ref (); |