summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a5
-rw-r--r--TAO/tao/ORBInitInfo.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 4199c47bc43..c4483083b00 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Sat Aug 18 08:59:32 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tao/ORBInitInfo.cpp: Fixed a compiler error in the static
+ builds.
+
Sat Aug 18 07:09:09 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
* Removed the "announcement" file since it was hopelessly
diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp
index ca9de009f2f..573fc81d57d 100644
--- a/TAO/tao/ORBInitInfo.cpp
+++ b/TAO/tao/ORBInitInfo.cpp
@@ -93,7 +93,7 @@ TAO_ORBInitInfo::codec_factory (CORBA::Environment &ACE_TRY_ENV)
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
- ACE_CHECK;
+ ACE_CHECK_RETURN (IOP::CodecFactory::_nil ())
this->codec_factory_ = codec_factory;
}