diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-12 16:02:25 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-12 16:02:25 +0000 |
| commit | d73e26ab693d50f88b4fbe2f21d5cd6be0952ec4 (patch) | |
| tree | 3b79cfa66f47135b45262fb2c2066f182ce73142 /TAO | |
| parent | 7d99fe3819c34ecde2a2376a809863fe5d421984 (diff) | |
| download | ATCD-d73e26ab693d50f88b4fbe2f21d5cd6be0952ec4.tar.gz | |
Wed Nov 12 16:02:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index eedab6c4017..4fea6ecf1e1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 12 16:02:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/Naming/Naming_Server.cpp: + Fixed compile error with CORBA/e micro + Wed Nov 12 13:10:00 UTC 2008 Simon Massey <sma at prismtech dot com> * tests/Bug_3499_Regression/DLL_Service.h: diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index 6060435a21f..8aec6373519 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -733,8 +733,10 @@ TAO_Naming_Server::fini (void) adapter->unbind ("NameService"); } +#if !defined (CORBA_E_MICRO) CORBA::Object_var svc = this->orb_->unregister_initial_reference ("NameService"); +#endif /* CORBA_E_MICRO */ } catch (const CORBA::Exception&) { |