diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2010-08-10 21:57:23 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2010-08-10 21:57:23 +0000 |
| commit | 2bcfef5e9c2d1220f86a8640b8f429800e6cc551 (patch) | |
| tree | e3bd9ddc0f873b57ad7532251f44975c13d74ccc /libcxx/test/strings | |
| parent | 0b6dce4ea4aa5b5553112cd3f3278315f27309c9 (diff) | |
| download | bcm5719-llvm-2bcfef5e9c2d1220f86a8640b8f429800e6cc551.tar.gz bcm5719-llvm-2bcfef5e9c2d1220f86a8640b8f429800e6cc551.zip | |
Fix conflict with cstring and using namespace std
llvm-svn: 110736
Diffstat (limited to 'libcxx/test/strings')
| -rw-r--r-- | libcxx/test/strings/c.strings/cstring.pass.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libcxx/test/strings/c.strings/cstring.pass.cpp b/libcxx/test/strings/c.strings/cstring.pass.cpp index 049d99e2e7d..63561ccb181 100644 --- a/libcxx/test/strings/c.strings/cstring.pass.cpp +++ b/libcxx/test/strings/c.strings/cstring.pass.cpp @@ -34,17 +34,17 @@ int main() static_assert((std::is_same<decltype(std::strncmp(cpc, cpc, s)), int>::value), ""); static_assert((std::is_same<decltype(std::strcoll(cpc, cpc)), int>::value), ""); static_assert((std::is_same<decltype(std::strxfrm(cp, cpc, s)), std::size_t>::value), ""); - static_assert((std::is_same<decltype(std::memchr(vpc, 0, s)), const void*>::value), ""); +// static_assert((std::is_same<decltype(std::memchr(vpc, 0, s)), const void*>::value), ""); static_assert((std::is_same<decltype(std::memchr(vp, 0, s)), void*>::value), ""); - static_assert((std::is_same<decltype(std::strchr(cpc, 0)), const char*>::value), ""); +// static_assert((std::is_same<decltype(std::strchr(cpc, 0)), const char*>::value), ""); static_assert((std::is_same<decltype(std::strchr(cp, 0)), char*>::value), ""); static_assert((std::is_same<decltype(std::strcspn(cpc, cpc)), std::size_t>::value), ""); - static_assert((std::is_same<decltype(std::strpbrk(cpc, cpc)), const char*>::value), ""); +// static_assert((std::is_same<decltype(std::strpbrk(cpc, cpc)), const char*>::value), ""); static_assert((std::is_same<decltype(std::strpbrk(cp, cpc)), char*>::value), ""); - static_assert((std::is_same<decltype(std::strrchr(cpc, 0)), const char*>::value), ""); +// static_assert((std::is_same<decltype(std::strrchr(cpc, 0)), const char*>::value), ""); static_assert((std::is_same<decltype(std::strrchr(cp, 0)), char*>::value), ""); static_assert((std::is_same<decltype(std::strspn(cpc, cpc)), std::size_t>::value), ""); - static_assert((std::is_same<decltype(std::strstr(cpc, cpc)), const char*>::value), ""); +// static_assert((std::is_same<decltype(std::strstr(cpc, cpc)), const char*>::value), ""); static_assert((std::is_same<decltype(std::strstr(cp, cpc)), char*>::value), ""); static_assert((std::is_same<decltype(std::strtok(cp, cpc)), char*>::value), ""); static_assert((std::is_same<decltype(std::memset(vp, 0, s)), void*>::value), ""); |
