summaryrefslogtreecommitdiffstats
path: root/contrib/libc++/src/system_error.cpp
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-10-06 17:53:29 +0000
committerdim <dim@FreeBSD.org>2015-10-06 17:53:29 +0000
commita6f4f28b545e1f0632ba4b20b86a7ab487932373 (patch)
treee9dbc6d658415636ba47d28716ee528c8ab7c862 /contrib/libc++/src/system_error.cpp
parent09f0c012db173aa7875b4d45fc67ef4d26c82548 (diff)
parent9ba87e73be0d01bbe1cf9547130ae12f9b15d7a7 (diff)
downloadFreeBSD-src-a6f4f28b545e1f0632ba4b20b86a7ab487932373.zip
FreeBSD-src-a6f4f28b545e1f0632ba4b20b86a7ab487932373.tar.gz
Upgrade our copies of clang, llvm, lldb, compiler-rt and libc++ to 3.7.0
release. Please note that from 3.5.0 onwards, clang, llvm and lldb require C++11 support to build; see UPDATING for more information. Release notes for llvm and clang can be found here: <http://llvm.org/releases/3.7.0/docs/ReleaseNotes.html> <http://llvm.org/releases/3.7.0/tools/clang/docs/ReleaseNotes.html> Thanks to Ed Maste, Andrew Turner and Antoine Brodin for their help. Exp-run: antoine Relnotes: yes
Diffstat (limited to 'contrib/libc++/src/system_error.cpp')
-rw-r--r--contrib/libc++/src/system_error.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/libc++/src/system_error.cpp b/contrib/libc++/src/system_error.cpp
index 9c8adc4..18f668f 100644
--- a/contrib/libc++/src/system_error.cpp
+++ b/contrib/libc++/src/system_error.cpp
@@ -7,11 +7,14 @@
//
//===----------------------------------------------------------------------===//
-#define _LIBCPP_BUILDING_SYSTEM_ERROR
#include "__config"
+
+#define _LIBCPP_BUILDING_SYSTEM_ERROR
#include "system_error"
-#include "string"
+
+#include "config_elast.h"
#include "cstring"
+#include "string"
_LIBCPP_BEGIN_NAMESPACE_STD
@@ -149,7 +152,7 @@ system_error::__init(const error_code& ec, string what_arg)
what_arg += ": ";
what_arg += ec.message();
}
- return _VSTD::move(what_arg);
+ return what_arg;
}
system_error::system_error(error_code ec, const string& what_arg)
OpenPOWER on IntegriCloud