diff options
Diffstat (limited to 'contrib/atf/atf-c++/tests.cpp')
| -rw-r--r-- | contrib/atf/atf-c++/tests.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/atf/atf-c++/tests.cpp b/contrib/atf/atf-c++/tests.cpp index cdc0dfb..2c351fc 100644 --- a/contrib/atf/atf-c++/tests.cpp +++ b/contrib/atf/atf-c++/tests.cpp @@ -55,9 +55,11 @@ extern "C" { #include "atf-c/utils.h" } +#include "noncopyable.hpp" #include "tests.hpp" #include "detail/application.hpp" +#include "detail/auto_array.hpp" #include "detail/env.hpp" #include "detail/exceptions.hpp" #include "detail/fs.hpp" @@ -127,7 +129,7 @@ detail::match(const std::string& regexp, const std::string& str) static std::map< atf_tc_t*, impl::tc* > wraps; static std::map< const atf_tc_t*, const impl::tc* > cwraps; -struct impl::tc_impl : atf::utils::noncopyable { +struct impl::tc_impl : atf::noncopyable { std::string m_ident; atf_tc_t m_tc; bool m_has_cleanup; @@ -190,8 +192,7 @@ impl::tc::init(const vars_map& config) { atf_error_t err; - utils::auto_array< const char * > array( - new const char*[(config.size() * 2) + 1]); + auto_array< const char * > array(new const char*[(config.size() * 2) + 1]); const char **ptr = array.get(); for (vars_map::const_iterator iter = config.begin(); iter != config.end(); iter++) { |
