diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-15 21:39:25 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-15 21:39:25 +0000 |
| commit | e26571d46110a45de8000091aa1d400cf3e33021 (patch) | |
| tree | 9eb9d84b53d378fcc191899a3558860aa387859f /TAO/tao | |
| parent | e4b0b432180736d8d1751e7e3373aa25ca88559e (diff) | |
| download | ATCD-e26571d46110a45de8000091aa1d400cf3e33021.tar.gz | |
ChangeLogTag:Thu Apr 15 16:35:27 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/Environment.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 298581a24d8..0242aa5648e 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -127,13 +127,7 @@ CORBA_Environment::default_environment () TAO_ORB_Core_instance ()->default_environment ()->clear (); #endif /* TAO_HAS_EXCEPTIONS */ - return *TAO_ORB_Core_instance ()->default_environment (); -} - -CORBA_Environment& -CORBA::default_environment () -{ - return CORBA_Environment::default_environment (); + return CORBA::default_environment (); } // Convenience -- say if the exception is a system exception or not. diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 7c06c579efd..b8c6c88bfca 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -23,6 +23,16 @@ typedef ACE_TSS_Singleton<TAO_ORB_Core_TSS_Resources, ACE_SYNCH_MUTEX> // **************************************************************** +CORBA_Environment& +CORBA::default_environment () +{ + // @@ This is a slight violation of layering, we should use + // TAO_ORB_Core_instance(), but that breaks during startup. + return *TAO_ORB_CORE_TSS_RESOURCES::instance ()->default_environment_; +} + +// **************************************************************** + TAO_ORB_Core::TAO_ORB_Core (void) : thr_mgr_ (0), connector_registry_ (0), |