summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-06-26 22:04:59 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-06-26 22:04:59 +0000
commit8bcd1d08e3cfe62e6d111bcb31ae0b74861540ef (patch)
treea13f172e66ca9cda5540a26307994d680f467744
parentd4ed4d40d148b7483c09971fb6c9ca593a695586 (diff)
downloadATCD-8bcd1d08e3cfe62e6d111bcb31ae0b74861540ef.tar.gz
ChangeLogTag:Mon Jun 26 14:56:42 2000 Carlos O'Ryan <coryan@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a5
-rw-r--r--TAO/tao/ORB.cpp7
2 files changed, 12 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index fccdf75450e..6492a29e872 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Mon Jun 26 14:56:42 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * tao/ORB.cpp:
+ Minor code review.
+
Wed Jun 21 20:01:37 2000 Carlos O'Ryan <coryan@uci.edu>
* tao/TAO.dsp:
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 889bed7d845..c92cd4c54a2 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -63,6 +63,9 @@ using std::set_unexpected;
ACE_RCSID(tao, ORB, "$Id$")
static const char ior_prefix [] = "IOR:";
+
+// @@ Priyanka: don't forget to remove this stuff once you add the
+// file: parser to the Parser Registry.
static const char file_prefix[] = "file://";
// = Static initialization.
@@ -1530,6 +1533,8 @@ CORBA_ORB::string_to_object (const char *str,
ACE_TRY_ENV);
}
+ // @@ Priyanka: once you have the file: parser into the Parser
+ // Registry we should remove the code below.
if (ACE_OS::strncmp (str,
file_prefix,
sizeof file_prefix - 1) == 0)
@@ -1673,6 +1678,8 @@ CORBA_ORB::ior_string_to_object (const char *str,
return objref;
}
+// @@ Priyanka: once you have the file: parser into the Parser
+// Registry we should remove the code below.
CORBA::Object_ptr
CORBA_ORB::file_string_to_object (const char* filename,
CORBA::Environment& ACE_TRY_ENV)