diff options
| author | Steve Huston <shuston@riverace.com> | 2003-01-03 22:52:53 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2003-01-03 22:52:53 +0000 |
| commit | c0a30925101c9053c42369452d298d05a9d9bd01 (patch) | |
| tree | 3f2a09f3a3d8d4615c75930b718bca5f5b9fa323 | |
| parent | 667bea8864100e05d334bb5c6821cb8a8256bc19 (diff) | |
| download | ATCD-c0a30925101c9053c42369452d298d05a9d9bd01.tar.gz | |
ChangeLogTag:Fri Jan 3 17:45:29 2003 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
| -rw-r--r-- | include/makeinclude/platform_hpux_gcc.GNU | 2 | ||||
| -rw-r--r-- | performance-tests/Misc/test_singleton.cpp | 2 |
4 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index c2629f2729d..6025383e3a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Jan 3 17:45:29 2003 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_hpux_gcc.GNU: Use HP's /usr/bin/ar + instead of GNU ar (which may be picked up first in PATH). GNU ar + crashes - missing libfl.sl. + + * performance-tests/Misc/test_singleton.cpp: Add __hpux to conditions + for explicitly instantiating ACE_Singleton::singleton_. + Fri Jan 3 07:49:09 2003 Chad Elliott <elliott_c@ociweb.com> * bin/aix_shr: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index c2629f2729d..6025383e3a2 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,12 @@ +Fri Jan 3 17:45:29 2003 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_hpux_gcc.GNU: Use HP's /usr/bin/ar + instead of GNU ar (which may be picked up first in PATH). GNU ar + crashes - missing libfl.sl. + + * performance-tests/Misc/test_singleton.cpp: Add __hpux to conditions + for explicitly instantiating ACE_Singleton::singleton_. + Fri Jan 3 07:49:09 2003 Chad Elliott <elliott_c@ociweb.com> * bin/aix_shr: diff --git a/include/makeinclude/platform_hpux_gcc.GNU b/include/makeinclude/platform_hpux_gcc.GNU index d96eec917df..bbd8a0129bf 100644 --- a/include/makeinclude/platform_hpux_gcc.GNU +++ b/include/makeinclude/platform_hpux_gcc.GNU @@ -65,6 +65,8 @@ DLD = $(CXX) LD = $(CXX) OCFLAGS += -O2 PIC = -fPIC +# GNU ar doesn't work (missing libfl.sl?) so use HP ar. +AR = /usr/bin/ar ARFLAGS = ruv RANLIB = echo LDFLAGS = -L. -L$(ACE_ROOT)/ace -Wl,+s diff --git a/performance-tests/Misc/test_singleton.cpp b/performance-tests/Misc/test_singleton.cpp index c4bc7a6d7a5..f46b9cf6e44 100644 --- a/performance-tests/Misc/test_singleton.cpp +++ b/performance-tests/Misc/test_singleton.cpp @@ -165,7 +165,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) template class ACE_Singleton<DC_Singleton, ACE_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Singleton<DC_Singleton, ACE_SYNCH_MUTEX> -#elif defined (__GNUC__) && defined (_AIX) +#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) template ACE_Singleton<DC_Singleton, ACE_SYNCH_MUTEX> * ACE_Singleton<DC_Singleton, ACE_SYNCH_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |