diff options
Diffstat (limited to 'ace/SString.cpp')
| -rw-r--r-- | ace/SString.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ace/SString.cpp b/ace/SString.cpp index 1f75d03800a..2f3557f9974 100644 --- a/ace/SString.cpp +++ b/ace/SString.cpp @@ -546,7 +546,7 @@ template ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_WSTRING_TYPE *, #pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &, const ACE_String_Base<ACE_WSTRING_TYPE> &) #pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &, const ACE_WSTRING_TYPE *) #pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_WSTRING_TYPE *,ACE_String_Base<ACE_WSTRING_TYPE> &) -#elif defined (__GNUC__) && defined (_AIX) +#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) template char ACE_String_Base<char>::NULL_String_; template ACE_WSTRING_TYPE ACE_String_Base<ACE_WSTRING_TYPE>::NULL_String_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |