From 644a6650d1f1891b0b9f6a519d359c8aaf92c524 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Sun, 5 Sep 2004 22:55:34 +0000 Subject: [PATCH] HPUX aCC A.01.21 can't deal with the literal string template, so disable it, at least for this compiler version. Bug 239465, r=dbaron. git-svn-id: svn://10.0.0.236/trunk@161801 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/string/public/nsAString.h | 2 +- mozilla/xpcom/string/public/nsSubstring.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/xpcom/string/public/nsAString.h b/mozilla/xpcom/string/public/nsAString.h index 6fcc0a0eb20..3675989c140 100644 --- a/mozilla/xpcom/string/public/nsAString.h +++ b/mozilla/xpcom/string/public/nsAString.h @@ -54,7 +54,7 @@ // If some platform(s) can't handle our template that matches literal strings, // then we'll disable it on those platforms. #ifndef NS_DISABLE_LITERAL_TEMPLATE -# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) & (__SUNPRO_CC < 0x560)) +# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) & (__SUNPRO_CC < 0x560)) || (defined(__HP_aCC) && (__HP_aCC <= 012100)) # define NS_DISABLE_LITERAL_TEMPLATE # endif #endif /* !NS_DISABLE_LITERAL_TEMPLATE */ diff --git a/mozilla/xpcom/string/public/nsSubstring.h b/mozilla/xpcom/string/public/nsSubstring.h index f0842cf571d..35a1a5687f1 100644 --- a/mozilla/xpcom/string/public/nsSubstring.h +++ b/mozilla/xpcom/string/public/nsSubstring.h @@ -48,7 +48,7 @@ // If some platform(s) can't handle our template that matches literal strings, // then we'll disable it on those platforms. #ifndef NS_DISABLE_LITERAL_TEMPLATE -# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) & (__SUNPRO_CC < 0x560)) +# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) & (__SUNPRO_CC < 0x560)) || (defined(__HP_aCC) && (__HP_aCC <= 012100)) # define NS_DISABLE_LITERAL_TEMPLATE # endif #endif /* !NS_DISABLE_LITERAL_TEMPLATE */