diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-05-15 18:21:57 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-05-15 18:21:57 +0000 |
| commit | e8b3f3495ae8c13b09ffe85e7eb8072ff08d3d98 (patch) | |
| tree | 9aafc5a6ace659b15dc187d1425a1410c1a4b45b | |
| parent | f4c7ddf485a583ba3e5b4f68a117f11dc987a462 (diff) | |
| download | ATCD-e8b3f3495ae8c13b09ffe85e7eb8072ff08d3d98.tar.gz | |
Wed May 15 18:21:40 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Exception.cpp:
Shouldn't put asserts in the core code
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/Exception.cpp | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 82c1ff3d3b8..db34adb5734 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed May 15 18:21:40 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Exception.cpp: + Shouldn't put asserts in the core code + Tue May 14 15:17:51 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 6ccb0efa2d0..54606cc1fde 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -35,14 +35,12 @@ CORBA::Exception::Exception (const char * repository_id, : id_ (CORBA::string_dup (repository_id)), name_ (CORBA::string_dup (local_name)) { - ACE_ASSERT (this->id_.in () != 0 && this->name_.in () != 0); } CORBA::Exception::Exception (const CORBA::Exception &src) : id_ (CORBA::string_dup (src.id_)), name_ (CORBA::string_dup (src.name_)) { - ACE_ASSERT (this->id_.in () != 0 && this->name_.in () != 0); } // NOTE: It's this code, not anything defined in a subclass, which is @@ -65,10 +63,7 @@ CORBA::Exception::operator= (const CORBA::Exception &src) if (this != &src) { this->id_ = CORBA::string_dup (src.id_); - ACE_ASSERT (this->id_.in () != 0); - this->name_ = CORBA::string_dup (src.name_); - ACE_ASSERT (this->name_.in () != 0); } return *this; |