summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-05-22 19:44:21 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-05-22 19:44:21 +0000
commitfb19dde5bfd42a03786ee50e6b300e47c45ace47 (patch)
tree55abc09b92b053d2b0e643e9451e3aded53defd3 /include
parent5a5de6ea3962782b02221b96b27dd064b25d381f (diff)
downloadsrc-test2-fb19dde5bfd42a03786ee50e6b300e47c45ace47.tar.gz
src-test2-fb19dde5bfd42a03786ee50e6b300e47c45ace47.zip
Notes
Diffstat (limited to 'include')
-rw-r--r--include/lldb/Utility/Status.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/lldb/Utility/Status.h b/include/lldb/Utility/Status.h
index 4ac191b1f613..d8fd41707f8c 100644
--- a/include/lldb/Utility/Status.h
+++ b/include/lldb/Utility/Status.h
@@ -1,5 +1,4 @@
-//===-- Status.h -------------------------------------------------*- C++
-//-*-===//
+//===-- Status.h ------------------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -8,22 +7,20 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __DCError_h__
-#define __DCError_h__
-#if defined(__cplusplus)
+#ifndef LLDB_UTILITY_STATUS_H
+#define LLDB_UTILITY_STATUS_H
#include "lldb/lldb-defines.h"
#include "lldb/lldb-enumerations.h" // for ErrorType, ErrorType...
#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/Support/Error.h"
#include "llvm/Support/FormatVariadic.h"
-
#include <cstdarg>
+#include <stdint.h> // for uint32_t
#include <string>
#include <system_error> // for error_code
#include <type_traits> // for forward
-#include <stdint.h> // for uint32_t
-
namespace llvm {
class raw_ostream;
}
@@ -106,6 +103,10 @@ public:
~Status();
+ // llvm::Error support
+ explicit Status(llvm::Error error);
+ llvm::Error ToError() const;
+
//------------------------------------------------------------------
/// Get the error string associated with the current error.
//
@@ -274,5 +275,4 @@ template <> struct format_provider<lldb_private::Status> {
};
}
-#endif // #if defined(__cplusplus)
-#endif // #ifndef __DCError_h__
+#endif // #ifndef LLDB_UTILITY_STATUS_H