Bug 347170 nsAString.h and nsSubstring.h should use && instead of &
jst: review+ darin: superreview+
This commit is contained in:
@@ -56,7 +56,7 @@
|
|||||||
// If some platform(s) can't handle our template that matches literal strings,
|
// If some platform(s) can't handle our template that matches literal strings,
|
||||||
// then we'll disable it on those platforms.
|
// then we'll disable it on those platforms.
|
||||||
#ifndef NS_DISABLE_LITERAL_TEMPLATE
|
#ifndef NS_DISABLE_LITERAL_TEMPLATE
|
||||||
# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) & (__SUNPRO_CC < 0x560)) || (defined(__HP_aCC) && (__HP_aCC <= 012100))
|
# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x560)) || (defined(__HP_aCC) && (__HP_aCC <= 012100))
|
||||||
# define NS_DISABLE_LITERAL_TEMPLATE
|
# define NS_DISABLE_LITERAL_TEMPLATE
|
||||||
# endif
|
# endif
|
||||||
#endif /* !NS_DISABLE_LITERAL_TEMPLATE */
|
#endif /* !NS_DISABLE_LITERAL_TEMPLATE */
|
||||||
|
|||||||
@@ -48,7 +48,7 @@
|
|||||||
// If some platform(s) can't handle our template that matches literal strings,
|
// If some platform(s) can't handle our template that matches literal strings,
|
||||||
// then we'll disable it on those platforms.
|
// then we'll disable it on those platforms.
|
||||||
#ifndef NS_DISABLE_LITERAL_TEMPLATE
|
#ifndef NS_DISABLE_LITERAL_TEMPLATE
|
||||||
# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) & (__SUNPRO_CC < 0x560)) || (defined(__HP_aCC) && (__HP_aCC <= 012100))
|
# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x560)) || (defined(__HP_aCC) && (__HP_aCC <= 012100))
|
||||||
# define NS_DISABLE_LITERAL_TEMPLATE
|
# define NS_DISABLE_LITERAL_TEMPLATE
|
||||||
# endif
|
# endif
|
||||||
#endif /* !NS_DISABLE_LITERAL_TEMPLATE */
|
#endif /* !NS_DISABLE_LITERAL_TEMPLATE */
|
||||||
|
|||||||
Reference in New Issue
Block a user