summaryrefslogtreecommitdiffstats
path: root/libcxx/test/strings
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2013-10-05 21:18:32 +0000
committerMarshall Clow <mclow.lists@gmail.com>2013-10-05 21:18:32 +0000
commit3ceafc7f0152bd9e41e5adbafd0a8a8af418f08d (patch)
tree90f35f5c736690e54a2ab63203a43e6e9d262f9a /libcxx/test/strings
parentc81e29435ab4ea1e44c6b8301bae3e4bdef821d9 (diff)
downloadbcm5719-llvm-3ceafc7f0152bd9e41e5adbafd0a8a8af418f08d.tar.gz
bcm5719-llvm-3ceafc7f0152bd9e41e5adbafd0a8a8af418f08d.zip
Mark namespaces for user defined literals as 'inline'
llvm-svn: 192047
Diffstat (limited to 'libcxx/test/strings')
-rw-r--r--libcxx/test/strings/basic.string.literals/literal1.fail.cpp4
-rw-r--r--libcxx/test/strings/basic.string.literals/literal3.pass.cpp20
2 files changed, 22 insertions, 2 deletions
diff --git a/libcxx/test/strings/basic.string.literals/literal1.fail.cpp b/libcxx/test/strings/basic.string.literals/literal1.fail.cpp
index 16641f2b57d..6ba0b30d458 100644
--- a/libcxx/test/strings/basic.string.literals/literal1.fail.cpp
+++ b/libcxx/test/strings/basic.string.literals/literal1.fail.cpp
@@ -13,9 +13,9 @@
int main()
{
#if _LIBCPP_STD_VER > 11
- using namespace std;
+ using std::string;
- std::string foo = ""s; // should fail w/conversion operator not found
+ string foo = ""s; // should fail w/conversion operator not found
#else
#error
#endif
diff --git a/libcxx/test/strings/basic.string.literals/literal3.pass.cpp b/libcxx/test/strings/basic.string.literals/literal3.pass.cpp
new file mode 100644
index 00000000000..98e3e40e058
--- /dev/null
+++ b/libcxx/test/strings/basic.string.literals/literal3.pass.cpp
@@ -0,0 +1,20 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+#include <string>
+#include <cassert>
+
+int main()
+{
+#if _LIBCPP_STD_VER > 11
+ using namespace std;
+
+ string foo = ""s;
+#endif
+}
OpenPOWER on IntegriCloud