summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a107
-rw-r--r--TAO/TAO_IDL/driver/drv_args.cpp2
-rw-r--r--TAO/tao/Cache_Entries.h3
3 files changed, 62 insertions, 50 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 5189c95b2d7..591308f9252 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,56 +1,65 @@
+Fri Jan 19 15:42:19 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * TAO_IDL/driver/drv_args.cpp:
+ Fixed problem when compiling without GPERF.
+
+ * tao/Cache_Entries.h:
+ In many platforms (including QNX/RTP) 'index' is a macro undefine
+ it in this header file as it is used as a method name.
+
Fri Jan 19 13:52:34 2001 Priyanka Gontla <pgontla@ece.uci.edu>
- * orbsvcs/tests/Security/RejectInsecure/Makefile:
- * orbsvcs/tests/Security/RejectInsecure/README:
- * orbsvcs/tests/Security/RejectInsecure/client.cpp :
- * orbsvcs/tests/Security/RejectInsecure/server.cpp :
- * orbsvcs/tests/Security/RejectInsecure/server_i.cpp :
- * orbsvcs/tests/Security/RejectInsecure/server_i.h :
- * orbsvcs/tests/Security/RejectInsecure/authorization_test.idl :
- * orbsvcs/tests/Security/RejectInsecure/authorization_test_i.h:
- * orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp :
- * orbsvcs/tests/Security/RejectInsecure/authorization_test_i.i :
- * orbsvcs/tests/Security/RejectInsecure/client.conf :
- * orbsvcs/tests/Security/RejectInsecure/client_nopassdwd.conf :
- * orbsvcs/tests/Security/RejectInsecure/server.conf :
- * orbsvcs/tests/Security/RejectInsecure/server_nopassdwd.conf :
-
- Test to check if insecure and unauthroized connections are
- rejected.
-
- * orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h:
- * orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp:
- * orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test.idl:
- * orbsvcs/tests/Security/SecurityLevel1/server.cpp:
- * orbsvcs/tests/Security/SecurityLevel1/client.cpp:
- * orbsvcs/tests/Security/SecurityLevel1/README :
- * orbsvcs/tests/Security/SecurityLevel1/Makefile :
-
- * orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h:
- * orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp:
- * orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test.idl:
- * orbsvcs/examples/Security/SecurityLevel1/server.cpp:
- * orbsvcs/examples/Security/SecurityLevel1/client.cpp:
- * orbsvcs/examples/Security/SecurityLevel1/README :
- * orbsvcs/examples/Security/SecurityLevel1/Makefile :
-
- Base for a test and example for the Security::Level1. These are
- no where near to compilation ready but will act as a base.
-
+ * orbsvcs/tests/Security/RejectInsecure/Makefile:
+ * orbsvcs/tests/Security/RejectInsecure/README:
+ * orbsvcs/tests/Security/RejectInsecure/client.cpp :
+ * orbsvcs/tests/Security/RejectInsecure/server.cpp :
+ * orbsvcs/tests/Security/RejectInsecure/server_i.cpp :
+ * orbsvcs/tests/Security/RejectInsecure/server_i.h :
+ * orbsvcs/tests/Security/RejectInsecure/authorization_test.idl :
+ * orbsvcs/tests/Security/RejectInsecure/authorization_test_i.h:
+ * orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp :
+ * orbsvcs/tests/Security/RejectInsecure/authorization_test_i.i :
+ * orbsvcs/tests/Security/RejectInsecure/client.conf :
+ * orbsvcs/tests/Security/RejectInsecure/client_nopassdwd.conf :
+ * orbsvcs/tests/Security/RejectInsecure/server.conf :
+ * orbsvcs/tests/Security/RejectInsecure/server_nopassdwd.conf :
+
+ Test to check if insecure and unauthroized connections are
+ rejected.
+
+ * orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h:
+ * orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp:
+ * orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test.idl:
+ * orbsvcs/tests/Security/SecurityLevel1/server.cpp:
+ * orbsvcs/tests/Security/SecurityLevel1/client.cpp:
+ * orbsvcs/tests/Security/SecurityLevel1/README :
+ * orbsvcs/tests/Security/SecurityLevel1/Makefile :
+
+ * orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h:
+ * orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp:
+ * orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test.idl:
+ * orbsvcs/examples/Security/SecurityLevel1/server.cpp:
+ * orbsvcs/examples/Security/SecurityLevel1/client.cpp:
+ * orbsvcs/examples/Security/SecurityLevel1/README :
+ * orbsvcs/examples/Security/SecurityLevel1/Makefile :
+
+ Base for a test and example for the Security::Level1. These are
+ no where near to compilation ready but will act as a base.
+
Fri Jan 19 13:16:10 2001 Priyanka Gontla <pgontla@ece.uci.edu>
- * tests/Param_Test/client.cpp:
- Included tao/DynamicInterface/Request.h explicitly as HPUX had
- problems.
-
- * tests/DynAny_Test/test_wrapper.cpp:
- Included ace/Log_Msg.h explicitly.
-
- * tao/Sequence_T.cpp:
- Included tao/Environment.h explicitly.
-
- * orbsvcs/orbsvcs/Makefile.SSLIOP:
- Put a check for defining ACE_SHLIBS to get it compiled on HPUX.
+ * tests/Param_Test/client.cpp:
+ Included tao/DynamicInterface/Request.h explicitly as HPUX had
+ problems.
+
+ * tests/DynAny_Test/test_wrapper.cpp:
+ Included ace/Log_Msg.h explicitly.
+
+ * tao/Sequence_T.cpp:
+ Included tao/Environment.h explicitly.
+
+ * orbsvcs/orbsvcs/Makefile.SSLIOP:
+ Put a check for defining ACE_SHLIBS to get it compiled on HPUX.
Fri Jan 19 14:32:28 2001 Jeff Parsons <parsons@cs.wustl.edu>
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 397734067ab..8b9731b4648 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -1127,7 +1127,7 @@ DRV_parse_args (long ac, char **av)
// If GPERF is not there, we cannot use PERFECT_HASH strategy. Let
// us go for DYNAMIC_HASH.
if ((be_global->lookup_strategy () == BE_GlobalData::TAO_PERFECT_HASH) ||
- (idl_global->lookup_strategy () == BE_GlobalData::TAO_BINARY_SEARCH) ||
+ (be_global->lookup_strategy () == BE_GlobalData::TAO_BINARY_SEARCH) ||
(be_global->lookup_strategy () == BE_GlobalData::TAO_LINEAR_SEARCH))
{
be_global->lookup_strategy (BE_GlobalData::TAO_DYNAMIC_HASH);
diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h
index a725698436e..747ce1a1d8a 100644
--- a/TAO/tao/Cache_Entries.h
+++ b/TAO/tao/Cache_Entries.h
@@ -31,6 +31,9 @@
class TAO_Connection_Handler;
class Tao_Base_Connection_Property;
+#ifdef index
+#undef index
+#endif /* index */
/**
* @class TAO_Cache_IntId
View Lorry Controller Status