diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2010-05-24 17:49:41 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2010-05-24 17:49:41 +0000 |
| commit | 128ba7191da78d948b72b9c7adddc37002b391ef (patch) | |
| tree | 777573e0e91f4127e3b389583832de434bff15fc /libcxx/src/ios.cpp | |
| parent | 8a57aeca2abfbdd7659af285c10af9e82ba7783d (diff) | |
| download | bcm5719-llvm-128ba7191da78d948b72b9c7adddc37002b391ef.tar.gz bcm5719-llvm-128ba7191da78d948b72b9c7adddc37002b391ef.zip | |
patch by Jeffrey Yasskin for porting to Ubuntu Hardy. Everything was accepted except there were some bug fixes needed in <locale> for the __nolocale_* series. For the apple branch I ended up using templates instead of the var_args solution because it seemed both safer and more efficient.
llvm-svn: 104516
Diffstat (limited to 'libcxx/src/ios.cpp')
| -rw-r--r-- | libcxx/src/ios.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libcxx/src/ios.cpp b/libcxx/src/ios.cpp index 3bf3cbc3a74..4d1261e3854 100644 --- a/libcxx/src/ios.cpp +++ b/libcxx/src/ios.cpp @@ -106,7 +106,11 @@ __iostream_category::name() const string __iostream_category::message(int ev) const { - if (ev != static_cast<int>(io_errc::stream) && ev <= ELAST) + if (ev != static_cast<int>(io_errc::stream) +#ifdef ELAST + && ev <= ELAST +#endif + ) return __do_message::message(ev); return string("unspecified iostream_category error"); } |
