summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-09-22 07:54:22 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-09-22 07:54:22 +0000
commitc1125f0889e30fcec32e61586119c182c813116d (patch)
tree102aeb9fc0826ad44222d1de3516e369903fcfa1
parent16886c2cc09a29464536ff24b8bf489f3e3c1bb8 (diff)
downloadATCD-c1125f0889e30fcec32e61586119c182c813116d.tar.gz
.
-rw-r--r--TAO/ChangeLog-98c11
-rw-r--r--TAO/TAO_IDL/be/be_interface.cpp2
-rw-r--r--TAO/examples/Simple/Makefile6
-rw-r--r--apps/gperf/ChangeLog3
-rw-r--r--apps/gperf/tests/Makefile2
5 files changed, 21 insertions, 3 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 6013f3e6508..7c2b4784289 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,14 @@
+Tue Sep 22 02:40:33 1998 Douglas C. Schmidt <schmidt@lambada.cs.wustl.edu>
+
+ * examples/Simple/Makefile (DIRS): Enabled all the "Simple" test
+ examples in the Makefile so we can see if they compile on other
+ platforms.
+
+ * TAO_IDL/be/be_interface.cpp (gen_perfect_hash_methods): Added
+ the -S1 flag, which generates a switch statement if duplicate
+ keys are encountered. This works around a bug with gperf that
+ needs to be fixed soon...
+
Mon Sep 22 01:08:51 1998 Kirthika Parameswaran <kirthika@cs.wustl.edu>
* changed examples/Simple/echo/Client_i.cpp
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index bfc21b786bf..850d634b4be 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -1379,7 +1379,7 @@ be_interface::gen_perfect_hash_methods (void)
" "
"-m -M -J -c -C"
" "
- "-D -E -T"
+ "-D -E -T -S1 -f 0"
" "
"-a -o -t -p -K"
" "
diff --git a/TAO/examples/Simple/Makefile b/TAO/examples/Simple/Makefile
index a43a33eecc4..1ad77b57aff 100644
--- a/TAO/examples/Simple/Makefile
+++ b/TAO/examples/Simple/Makefile
@@ -8,7 +8,11 @@
# Local macros
#----------------------------------------------------------------------------
-DIRS = time
+DIRS = bank \
+ chat \
+ echo \
+ grid \
+ time
#----------------------------------------------------------------------------
# Include macros and targets
diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog
index 197696a21a7..2344babe42c 100644
--- a/apps/gperf/ChangeLog
+++ b/apps/gperf/ChangeLog
@@ -1,5 +1,8 @@
Tue Sep 22 02:12:53 1998 Douglas C. Schmidt <schmidt@lambada.cs.wustl.edu>
+ * tests: Added a new test for the type of input that is causing
+ problems with TAO's IDL compiler.
+
* src/Key_List.cpp (output_lookup_array): Changed the assertion
from assert (i != 0) to assert (i >= 0) since I think that's
correct... (ah, so THAT's why comments are important thinks the
diff --git a/apps/gperf/tests/Makefile b/apps/gperf/tests/Makefile
index ecee6bf87c9..edd9fe604bc 100644
--- a/apps/gperf/tests/Makefile
+++ b/apps/gperf/tests/Makefile
@@ -57,7 +57,7 @@ all:
$(CXX) $(CCFLAGS) -o pout pinset.cpp test.o $(LDFLAGS) $(VLDLIBS)
./pout -v < $(srcdir)/pascal.gperf > pascal.out
-diff -b $(srcdir)/pascal.exp pascal.out
- $(GPERF) -m -M -c -C -D -E -T -a -o -p < $(srcdir)/idl.gperf > iinset.cpp
+ $(GPERF) -m -M -c -C -D -S1 -E -T -a -o -p < $(srcdir)/idl.gperf > iinset.cpp
$(CXX) $(CCFLAGS) -o iout iinset.cpp test.o $(LDFLAGS) $(VLDLIBS)
./iout -v < $(srcdir)/idl.gperf > idl.out
-diff -b $(srcdir)/idl.exp idl.out