diff options
| author | ngie <ngie@FreeBSD.org> | 2014-12-21 08:30:18 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2014-12-21 08:30:18 +0000 |
| commit | dc3ad5131fa6525673d58aa537f9d67ba69edb94 (patch) | |
| tree | 1473124a62111de8a694012ddb628f25f249137d /contrib/atf/atf-c++/detail/text.cpp | |
| parent | 1a3934911c5c7b282bc36336bafe16e321f63922 (diff) | |
| download | FreeBSD-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/text.cpp')
| -rw-r--r-- | contrib/atf/atf-c++/detail/text.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/contrib/atf/atf-c++/detail/text.cpp b/contrib/atf/atf-c++/detail/text.cpp index 66eebf0..35a0bec 100644 --- a/contrib/atf/atf-c++/detail/text.cpp +++ b/contrib/atf/atf-c++/detail/text.cpp @@ -1,6 +1,3 @@ -// -// Automated Testing Framework (atf) -// // Copyright (c) 2007 The NetBSD Foundation, Inc. // All rights reserved. // @@ -25,7 +22,8 @@ // 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/text.hpp" extern "C" { #include <regex.h> @@ -35,13 +33,11 @@ extern "C" { #include <cstring> extern "C" { -#include "../../atf-c/error.h" - -#include "../../atf-c/detail/text.h" +#include "atf-c/detail/text.h" +#include "atf-c/error.h" } -#include "exceptions.hpp" -#include "text.hpp" +#include "atf-c++/detail/exceptions.hpp" namespace impl = atf::text; #define IMPL_NAME "atf::text" |
