diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | ace/config-irix6.5.x-sgic++.h | 3 | ||||
| -rw-r--r-- | ace/config-irix6.x-common.h | 4 | ||||
| -rw-r--r-- | ace/config-irix6.x-sgic++-nothreads.h | 1 | ||||
| -rw-r--r-- | include/makeinclude/platform_irix6.x_sgic++.GNU | 16 |
5 files changed, 40 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index ee2c71ff4c9..32ef183a69b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +Tue Dec 9 15:09:55 UTC 2003 Don Hinton <dhinton@dresystems.com> + + Thanks to Bruce Jones <bruce.jones@cubic.com> for the + following patches for IRIX. + + * ace/config-irix6.5.x-sgic++.h: + Removed ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION and + added ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION. + + * ace/config-irix6.x-common.h: + Added ACE_LACKS_PERFECT_MULTICAST_FILTERING. + + * ace/config-irix6.x-sgic++-nothreads.h: + Added ACE_LACKS_STDINT_H. + + * include/makeinclude/platform_irix6.x_sgic++.GNU: + Set templates = implicit in not yet defined and only add + -no_prelink to CCFLAGS if templates != implicit. + Mon Dec 8 19:44:04 UTC 2003 Don Hinton <dhinton@dresystems.com> * include/makeinclude/rules.bin.GNU: diff --git a/ace/config-irix6.5.x-sgic++.h b/ace/config-irix6.5.x-sgic++.h index d3fada546a2..6e7feff26fe 100644 --- a/ace/config-irix6.5.x-sgic++.h +++ b/ace/config-irix6.5.x-sgic++.h @@ -10,6 +10,9 @@ // Include IRIX 6.[234] configuration #include "ace/config-irix6.x-sgic++.h" +#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION +#define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION + // Irix 6.5 man pages show that they exist #undef ACE_LACKS_CONDATTR_PSHARED #undef ACE_LACKS_MUTEXATTR_PSHARED diff --git a/ace/config-irix6.x-common.h b/ace/config-irix6.x-common.h index f4260bc3c06..1dbe1a31de6 100644 --- a/ace/config-irix6.x-common.h +++ b/ace/config-irix6.x-common.h @@ -128,6 +128,10 @@ // Platform supports IP multicast #define ACE_HAS_IP_MULTICAST +#ifdef ACE_LACKS_PERFECT_MULTICAST_FILTERING + #undef ACE_LACKS_PERFECT_MULTICAST_FILTERING +#endif +#define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 #define ACE_HAS_STRPTIME diff --git a/ace/config-irix6.x-sgic++-nothreads.h b/ace/config-irix6.x-sgic++-nothreads.h index 5c1f41810b8..60889add585 100644 --- a/ace/config-irix6.x-sgic++-nothreads.h +++ b/ace/config-irix6.x-sgic++-nothreads.h @@ -29,6 +29,7 @@ #define ACE_HAS_SGIDLADD #define ACE_HAS_P_READ_WRITE #define ACE_LACKS_LINEBUFFERED_STREAMBUF +#define ACE_LACKS_STDINT_H #define ACE_HAS_SETOWN #define ACE_HAS_SYSENT_H #define ACE_HAS_SYSINFO diff --git a/include/makeinclude/platform_irix6.x_sgic++.GNU b/include/makeinclude/platform_irix6.x_sgic++.GNU index d6dd7fffc56..2b32d43dd98 100644 --- a/include/makeinclude/platform_irix6.x_sgic++.GNU +++ b/include/makeinclude/platform_irix6.x_sgic++.GNU @@ -1,3 +1,5 @@ +# -*- Makefile -*- + # $Id$ # Irix 6.[234] with SGI C++ @@ -15,6 +17,10 @@ ifeq (,$(threads)) threads = 1 endif +ifndef templates + templates = implicit +endif # templates + include $(ACE_ROOT)/include/makeinclude/platform_irix6.x_common.GNU # Instead of setting the ABI here we rely on the the macro SGI_ABI. @@ -44,9 +50,12 @@ CCFLAGS += -exceptions -DACE_HAS_EXCEPTIONS # Use the standard library and standard template instantiation mechanisms CCFLAGS += -LANG:std -# Instantiate no templates automatically, do not run prelinker. There -# are other choices available, but those have not been used in a while. -CCFLAGS += -ptnone -no_prelink +ifneq ($(templates),implicit) + # Instantiate no templates automatically, do not run prelinker. There + # are other choices available, but those have not been used in a while. + CCFLAGS += -no_prelink +endif # templates != implicit + # Instantiate everything; without this, apps/Gateway/Gateway/gatewayd might # not build due to missing template instantiations. NOTE: it seems # this setting no longer works for ACE. @@ -55,6 +64,7 @@ CCFLAGS += -ptnone -no_prelink #CCFLAGS += -ptused -prelink # Instantiate used templates, but do not run prelinker #CCFLAGS += -ptused + # Suppress warnings about "pack" pragmas not being defined # Suppress warnings about "member with the same name as its class" # Suppress warnings about "class has no copy assignment operator" |