ChangeLogTag: Mon Feb 25 14:06:45 2002 Chad Elliott <elliott_c@ociweb.com>

7 files changed, 71 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index bc4bedbf699..2be582793ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Mon Feb 25 14:06:45 2002  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/config-hpux-11.00.h:
+
+          Do not define __HP_aCC if using KCC.
+
+        * include/makeinclude/platform_hpux_kcc.GNU:
+
+          Add the --one-instantiation-per-object parameter to avoid
+          build problems with KCC.
+
+        * tests/Dirent_Test.cpp:
+
+          Modify this test to work with Chorus (as it does with VxWorks).
+
+        * ace/config-aix-4.x.h:
+
+          Defined ACE_HAS_USING_KEYWORD for AIX 4.x with Visual Age 5 or
+          later.  This change came from Yan Dai <dai_y@ociweb.com>
+
 Tue Mar 12 11:53:53 2002  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/perltest2cpp.pl:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index bc4bedbf699..2be582793ea 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,23 @@
+Mon Feb 25 14:06:45 2002  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/config-hpux-11.00.h:
+
+          Do not define __HP_aCC if using KCC.
+
+        * include/makeinclude/platform_hpux_kcc.GNU:
+
+          Add the --one-instantiation-per-object parameter to avoid
+          build problems with KCC.
+
+        * tests/Dirent_Test.cpp:
+
+          Modify this test to work with Chorus (as it does with VxWorks).
+
+        * ace/config-aix-4.x.h:
+
+          Defined ACE_HAS_USING_KEYWORD for AIX 4.x with Visual Age 5 or
+          later.  This change came from Yan Dai <dai_y@ociweb.com>
+
 Tue Mar 12 11:53:53 2002  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/perltest2cpp.pl:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index bc4bedbf699..2be582793ea 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,23 @@
+Mon Feb 25 14:06:45 2002  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/config-hpux-11.00.h:
+
+          Do not define __HP_aCC if using KCC.
+
+        * include/makeinclude/platform_hpux_kcc.GNU:
+
+          Add the --one-instantiation-per-object parameter to avoid
+          build problems with KCC.
+
+        * tests/Dirent_Test.cpp:
+
+          Modify this test to work with Chorus (as it does with VxWorks).
+
+        * ace/config-aix-4.x.h:
+
+          Defined ACE_HAS_USING_KEYWORD for AIX 4.x with Visual Age 5 or
+          later.  This change came from Yan Dai <dai_y@ociweb.com>
+
 Tue Mar 12 11:53:53 2002  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/perltest2cpp.pl:
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 1005ccb8ab6..e3148b452bd 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -45,6 +45,9 @@
 #    undef WIFEXITED
 #    undef WEXITSTATUS
 #    if (__IBMCPP__ >= 500)  /* Visual Age C++ 5 */
+#      if !defined (ACE_HAS_USING_KEYWORD)
+#        define ACE_HAS_USING_KEYWORD            1
+#      endif /* ACE_HAS_USING_KEYWORD */
 #      define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #      define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #      if !defined (__TEMPINC__)
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index 97cc1f29d18..1fd1508fa52 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -64,7 +64,7 @@
 // macro is not set until A.03.13. If it's not set, set it - it won't be an
 // HP-advertised value, but we don't check the value/version - just whether
 // it's set or not.
-#    if !defined (__HP_aCC)
+#    if !defined (__KCC) && !defined (__HP_aCC)
 #      define __HP_aCC
 #    endif /* __HP_aCC */
 
diff --git a/include/makeinclude/platform_hpux_kcc.GNU b/include/makeinclude/platform_hpux_kcc.GNU
index eb7c11dee0d..1184b0f9495 100644
--- a/include/makeinclude/platform_hpux_kcc.GNU
+++ b/include/makeinclude/platform_hpux_kcc.GNU
@@ -48,7 +48,7 @@ endif
 
 CC           = cc
 CXX          = KCC
-CCFLAGS     += $(CFLAGS) $(THR_DEFS) -DACE_LACKS_PRAGMA_ONCE
+CCFLAGS     += $(CFLAGS) $(THR_DEFS) -DACE_LACKS_PRAGMA_ONCE --one_instantiation_per_object
 DCFLAGS     += +K0 -g
 DLD          = $(CXX) $(CCFLAGS)
 LD           = $(CXX)
@@ -69,13 +69,16 @@ ARFLAGS     += -Bstatic -o
 # Warning #111 statement is unreachable
 CCFLAGS     += --diag_suppress 111
 
+# KCC always uses the standard cpp library
+CCFLAGS     += -DACE_HAS_STANDARD_CPP_LIBRARY=1
+
 #
 # libpthread is automatically linked in by KCC if we use --thread_safe,
 # therefore we do not need to explicitly supply it.
 # If we link statically and libpthread is supplied with $(LIBS), the
 # program will core dump.
 #
-LIBS        += -Bdynamic -lxti -lrt -ldld
+LIBS        += -Bdynamic -lxti -lrt
 
 ifdef static_libs_only
   ifneq ($(static_libs_only),0)
diff --git a/tests/Dirent_Test.cpp b/tests/Dirent_Test.cpp
index dcd46f7bd21..4fd07c47c83 100644
--- a/tests/Dirent_Test.cpp
+++ b/tests/Dirent_Test.cpp
@@ -31,13 +31,13 @@
 
 ACE_RCSID(tests, Dirent_Test, "$Id$")
 
-#if defined (VXWORKS)
+#if defined (VXWORKS) || defined(CHORUS)
 #define TEST_DIR "."
 #define TEST_ENTRY ".."
 #else
 #define TEST_DIR "../tests"
 #define TEST_ENTRY "Dirent_Test.cpp"
-#endif /* VXWORKS */
+#endif /* VXWORKS || CHORUS */
 
 // Number of entries in the directory.
 static int entrycount = 0;