ChangeLogTag: Fri May 10 18:29:48 2002 Krishnakumar B <kitty@cs.wustl.edu>

5 files changed, 74 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 2fc6a86e02e..34e42a09ba1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri May 10 18:29:48 2002  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/config-icc-common.h (ACE_HAS_ANSI_CASTS):
+        * include/makeinclude/platform_linux_icc.GNU:
+
+          Fixed the config file to ensure compilation with Intel C++
+          Compiler version 6.0.
+
 Fri May 10 18:16:50 2002  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* ace/Connector.cpp (handle_output): Removed unnecessary debug
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 2fc6a86e02e..34e42a09ba1 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Fri May 10 18:29:48 2002  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/config-icc-common.h (ACE_HAS_ANSI_CASTS):
+        * include/makeinclude/platform_linux_icc.GNU:
+
+          Fixed the config file to ensure compilation with Intel C++
+          Compiler version 6.0.
+
 Fri May 10 18:16:50 2002  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* ace/Connector.cpp (handle_output): Removed unnecessary debug
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 2fc6a86e02e..34e42a09ba1 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,11 @@
+Fri May 10 18:29:48 2002  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/config-icc-common.h (ACE_HAS_ANSI_CASTS):
+        * include/makeinclude/platform_linux_icc.GNU:
+
+          Fixed the config file to ensure compilation with Intel C++
+          Compiler version 6.0.
+
 Fri May 10 18:16:50 2002  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* ace/Connector.cpp (handle_output): Removed unnecessary debug
diff --git a/ace/config-icc-common.h b/ace/config-icc-common.h
index 031f9609873..3887c918683 100644
--- a/ace/config-icc-common.h
+++ b/ace/config-icc-common.h
@@ -4,34 +4,57 @@
 #define ACE_LINUX_ICC_COMMON_H
 #include "ace/pre.h"
 
-// Initial config file for the Intel compiler.  There are probably many things
-// that could or should be defined, but this seems to work.
-
+# define ACE_HAS_ANSI_CASTS
+# define ACE_HAS_CPLUSPLUS_HEADERS
+# define ACE_HAS_EXPLICIT_KEYWORD
+# define ACE_HAS_MUTABLE_KEYWORD
+# define ACE_HAS_STDCPP_STL_INCLUDES
+# define ACE_HAS_TEMPLATE_TYPEDEFS
+# define ACE_HAS_TYPENAME_KEYWORD
+# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
+# define ACE_HAS_STANDARD_CPP_LIBRARY 1
+# define ACE_HAS_TEMPLATE_SPECIALIZATION
+# define ACE_HAS_USING_KEYWORD
+# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
+# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+# define ACE_HAS_STRING_CLASS
+
+// __EXCEPTIONS is defined with -fexceptions, the egcs default.  It
+// is not defined with -fno-exceptions, the ACE default for g++.
+// ACE_HAS_EXCEPTIONS is defined in
+// include/makeinclude/wrapper_macros.GNU, so this really isn't
+// necessary.  Just in case . . .
+# if defined (__EXCEPTIONS) && !defined (ACE_HAS_EXCEPTIONS)
+#   define ACE_HAS_EXCEPTIONS
+# endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */
+
+# if defined (ACE_HAS_EXCEPTIONS)
+#   define ACE_NEW_THROWS_EXCEPTIONS
+# endif /* ACE_HAS_EXCEPTIONS */
+
+#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
+# define ACE_SIZEOF_LONG_DOUBLE 12
+#endif /* i386 */
 
-#if defined (i386) || defined (__i386__)
+#if !defined (__MINGW32__) && (defined (i386) || defined (__i386__))
   // If running an Intel, assume that it's a Pentium so that
-  // ACE_OS::gethrtime () can use the RDTSC instruction.  If
-  // running a 486 or lower, be sure to comment this out.
-  // (If not running an Intel CPU, this #define will not be seen
-  //  because of the i386 protection, so it can be ignored.)
+  // ACE_OS::gethrtime () can use the RDTSC instruction.  If running a
+  // 486 or lower, be sure to comment this out.  (If not running an
+  // Intel CPU, this #define will not be seen because of the i386
+  // protection, so it can be ignored.)
 # define ACE_HAS_PENTIUM
 #endif /* i386 */
 
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
-#define ACE_HAS_USING_KEYWORD
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+  // We define it with a -D with make depend.
+# define ACE_LACKS_PRAGMA_ONCE
+#endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
-#define ACE_LACKS_ACE_IOSTREAM 1
-
-#define ACE_HAS_CPLUSPLUS_HEADERS 1
-
-// Define this if you want to use the standard C++ library
-#define ACE_HAS_STANDARD_CPP_LIBRARY 1
+#define ACE_TEMPLATES_REQUIRE_SOURCE
 
-#define ACE_HAS_STRING_CLASS
-#define ACE_HAS_EXCEPTIONS 1
-#define ACE_NEW_THROWS_EXCEPTIONS
+# if defined (ACE_HAS_EXCEPTIONS)
+#   define ACE_NEW_THROWS_EXCEPTIONS
+# endif /* ACE_HAS_EXCEPTIONS */
 
 #include "ace/post.h"
 #endif /* ACE_LINUX_ICC_COMMON_H */
-
diff --git a/include/makeinclude/platform_linux_icc.GNU b/include/makeinclude/platform_linux_icc.GNU
index 9d3913d39f6..13fadaa338f 100644
--- a/include/makeinclude/platform_linux_icc.GNU
+++ b/include/makeinclude/platform_linux_icc.GNU
@@ -28,7 +28,7 @@ ifeq ($(threads),0)
 endif # threads
 
 PLATFORM_XT_CPPFLAGS=
-PLATFORM_XT_LIBS=-lXt  
+PLATFORM_XT_LIBS=-lXt
 LATFORM_XT_LDFLAGS=
 
 PLATFORM_FL_CPPFLAGS=
@@ -69,24 +69,24 @@ ifeq ($(threads),1)
 endif # threads
 
 
-CCFLAGS += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG)
+CCFLAGS += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG) -ip
 DCFLAGS += -g
 DLD     = $(CXX)
 LD      = $(CXX)
 LIBS    += -ldl
 
-ifeq ($(threads),1) 
+ifeq ($(threads),1)
   LIBS += -lpthread
   ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT))
     LIBS += -lrt
   endif
-endif 
+endif
 
 PLATFORM_QT_CPPFLAGS=-I$(QTDIR)/include
 PLATFORM_QT_LIBS=-lqt
 PLATFORM_QT_LDFLAGS=-L$(QTDIR)/lib
 
-OCFLAGS += -O2
+OCFLAGS += -O3 -axK
 PIC     = -KPIC
 AR      = ar
 ARFLAGS = rsuv
@@ -99,11 +99,9 @@ PRELIB  = @true
 # Added line below to support "Executable Shared Object" files (as
 # needed by the service configurator).
 # Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
-ifeq ($(threads),1) 
+ifeq ($(threads),1)
     ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $<
     ifndef PRELIB
        PRELIB = @true
     endif # ! PRELIB
 endif
-
-