summaryrefslogtreecommitdiffstats
path: root/contrib/atf/atf-c++/detail/exceptions.cpp
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2014-12-21 08:30:18 +0000
committerngie <ngie@FreeBSD.org>2014-12-21 08:30:18 +0000
commitdc3ad5131fa6525673d58aa537f9d67ba69edb94 (patch)
tree1473124a62111de8a694012ddb628f25f249137d /contrib/atf/atf-c++/detail/exceptions.cpp
parent1a3934911c5c7b282bc36336bafe16e321f63922 (diff)
downloadFreeBSD-src-dc3ad5131fa6525673d58aa537f9d67ba69edb94.zip
FreeBSD-src-dc3ad5131fa6525673d58aa537f9d67ba69edb94.tar.gz
MFC r273929:
r273929 (by jmmv): MFV: Import atf-0.21.
Diffstat (limited to 'contrib/atf/atf-c++/detail/exceptions.cpp')
-rw-r--r--contrib/atf/atf-c++/detail/exceptions.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/contrib/atf/atf-c++/detail/exceptions.cpp b/contrib/atf/atf-c++/detail/exceptions.cpp
index 79c5b48..a5b74a3 100644
--- a/contrib/atf/atf-c++/detail/exceptions.cpp
+++ b/contrib/atf/atf-c++/detail/exceptions.cpp
@@ -1,6 +1,3 @@
-//
-// Automated Testing Framework (atf)
-//
// Copyright (c) 2007 The NetBSD Foundation, Inc.
// All rights reserved.
//
@@ -25,10 +22,11 @@
// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
+#include "atf-c++/detail/exceptions.hpp"
#if defined(HAVE_CONFIG_H)
-#include "bconfig.h"
+#include "config.h"
#endif
#include <cstdarg>
@@ -37,11 +35,10 @@
#include <new>
extern "C" {
-#include "../../atf-c/error.h"
-};
+#include "atf-c/error.h"
+}
-#include "exceptions.hpp"
-#include "sanity.hpp"
+#include "atf-c++/detail/sanity.hpp"
// ------------------------------------------------------------------------
// The "system_error" type.
OpenPOWER on IntegriCloud