Fix missing includes. Prefer C++11 over TR1 when using libc++ or C++11.


(joerg)

$NetBSD: patch-engine_action.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- engine/action.hpp.orig	2013-05-06 08:08:05.000000000 +0000
+++ engine/action.hpp
@@ -33,7 +33,13 @@
 #define ENGINE_ACTION_HPP
 
 #include <ostream>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
 #include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 
 namespace engine {
 
@@ -50,7 +56,7 @@ class action {
     struct impl;
 
     /// Pointer to the shared internal implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
 public:
     explicit action(const context&);

$NetBSD: patch-engine_context.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- engine/context.hpp.orig	2013-05-06 08:09:15.000000000 +0000
+++ engine/context.hpp
@@ -35,7 +35,13 @@
 #include <map>
 #include <ostream>
 #include <string>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
 #include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 
 #include "utils/fs/path.hpp"
 
@@ -51,7 +57,7 @@ class context {
     struct impl;
 
     /// Pointer to the shared internal implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
 public:
     context(const utils::fs::path&,

$NetBSD: patch-engine_test__case.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- engine/test_case.hpp.orig	2013-05-06 08:06:18.000000000 +0000
+++ engine/test_case.hpp
@@ -34,7 +34,13 @@
 
 #include <ostream>
 #include <string>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
 #include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 
 #include "engine/metadata.hpp"
 #include "utils/config/tree.hpp"
@@ -71,7 +77,7 @@ class test_case {
     struct impl;
 
     /// Pointer to the shared internal implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
 public:
     test_case(const std::string&, const test_program&,
@@ -96,7 +102,7 @@ std::ostream& operator<<(std::ostream&, 
 
 
 /// Pointer to a test case.
-typedef std::tr1::shared_ptr< test_case > test_case_ptr;
+typedef shared_ptr< test_case > test_case_ptr;
 
 
 test_result debug_test_case(const test_case*, const utils::config::tree&,

$NetBSD: patch-engine_test__program.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- engine/test_program.hpp.orig	2013-05-06 08:09:43.000000000 +0000
+++ engine/test_program.hpp
@@ -40,8 +40,14 @@
 
 #include <ostream>
 #include <string>
-#include <tr1/memory>
 #include <vector>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
+#include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 
 #include "engine/test_case.hpp"
 #include "utils/fs/path.hpp"
@@ -61,7 +67,7 @@ class test_program {
     struct impl;
 
     /// Pointer to the shared internal implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
 public:
     test_program(const std::string&, const utils::fs::path&,
@@ -89,7 +95,7 @@ std::ostream& operator<<(std::ostream&, 
 
 
 /// Pointer to a test program.
-typedef std::tr1::shared_ptr< test_program > test_program_ptr;
+typedef shared_ptr< test_program > test_program_ptr;
 
 
 /// Collection of test programs.

$NetBSD: patch-store_backend.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- store/backend.hpp.orig	2013-05-06 07:36:42.000000000 +0000
+++ store/backend.hpp
@@ -32,7 +32,14 @@
 #if !defined(STORE_BACKEND_HPP)
 #define STORE_BACKEND_HPP
 
+#include <ciso646>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
 #include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 
 namespace utils {
 namespace fs {
@@ -72,7 +79,7 @@ class backend {
     struct impl;
 
     /// Pointer to the shared internal implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
     friend class metadata;
 

$NetBSD: patch-store_transaction.cpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- store/transaction.cpp.orig	2013-05-06 08:17:59.000000000 +0000
+++ store/transaction.cpp
@@ -437,7 +437,7 @@ struct store::results_iterator::impl {
 ///
 /// \param pimpl_ The internal implementation details of the iterator.
 store::results_iterator::results_iterator(
-    std::tr1::shared_ptr< impl > pimpl_) :
+    shared_ptr< impl > pimpl_) :
     _pimpl(pimpl_)
 {
 }
@@ -680,7 +680,7 @@ store::results_iterator
 store::transaction::get_action_results(const int64_t action_id)
 {
     try {
-        return results_iterator(std::tr1::shared_ptr< results_iterator::impl >(
+        return results_iterator(shared_ptr< results_iterator::impl >(
            new results_iterator::impl(_pimpl->_backend, action_id)));
     } catch (const sqlite::error& e) {
         throw error(e.what());

$NetBSD: patch-store_transaction.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- store/transaction.hpp.orig	2013-05-06 08:16:11.000000000 +0000
+++ store/transaction.hpp
@@ -37,7 +37,13 @@ extern "C" {
 }
 
 #include <string>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
 #include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 #include <utility>
 
 #include "engine/test_program.hpp"
@@ -77,10 +83,10 @@ class results_iterator {
     struct impl;
 
     /// Pointer to the shared internal implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
     friend class transaction;
-    results_iterator(std::tr1::shared_ptr< impl >);
+    results_iterator(shared_ptr< impl >);
 
 public:
     ~results_iterator(void);
@@ -106,7 +112,7 @@ class transaction {
     struct impl;
 
     /// Pointer to the shared internal implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
     friend class backend;
     transaction(backend&);

$NetBSD: patch-utils_cmdline_exceptions.cpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/cmdline/exceptions.cpp.orig	2013-05-06 08:19:49.000000000 +0000
+++ utils/cmdline/exceptions.cpp
@@ -26,6 +26,7 @@
 // (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 <string>
 #include "utils/cmdline/exceptions.hpp"
 
 #include "utils/format/macros.hpp"

$NetBSD: patch-utils_cmdline_exceptions.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/cmdline/exceptions.hpp.orig	2013-05-06 08:24:33.000000000 +0000
+++ utils/cmdline/exceptions.hpp
@@ -33,6 +33,7 @@
 #define UTILS_CMDLINE_EXCEPTIONS_HPP
 
 #include <stdexcept>
+#include <string>
 
 namespace utils {
 namespace cmdline {

$NetBSD: patch-utils_config_tree.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/config/tree.hpp.orig	2013-01-26 03:01:41.000000000 +0000
+++ utils/config/tree.hpp
@@ -34,7 +34,13 @@
 
 #include <map>
 #include <string>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
 #include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 
 #include <lutok/state.hpp>
 
@@ -82,7 +88,7 @@ typedef std::map< std::string, std::stri
 /// deep_copy().
 class tree {
     /// The root of the tree.
-    std::tr1::shared_ptr< detail::static_inner_node > _root;
+    shared_ptr< detail::static_inner_node > _root;
 
     explicit tree(detail::static_inner_node*);
 

$NetBSD: patch-utils_datetime.cpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/datetime.cpp.orig	2013-05-06 08:18:02.000000000 +0000
+++ utils/datetime.cpp
@@ -183,7 +183,7 @@ struct timestamp::impl {
 /// Constructs a new timestamp.
 ///
 /// \param pimpl_ An existing impl representation.
-datetime::timestamp::timestamp(std::tr1::shared_ptr< impl > pimpl_) :
+datetime::timestamp::timestamp(shared_ptr< impl > pimpl_) :
     _pimpl(pimpl_)
 {
 }
@@ -201,7 +201,7 @@ datetime::timestamp::from_microseconds(c
     ::timeval data;
     data.tv_sec = static_cast< time_t >(value / 1000000);
     data.tv_usec = static_cast< suseconds_t >(value % 1000000);
-    return timestamp(std::tr1::shared_ptr< impl >(new impl(data)));
+    return timestamp(shared_ptr< impl >(new impl(data)));
 }
 
 
@@ -257,7 +257,7 @@ datetime::timestamp::from_values(const i
     ::timeval data;
     data.tv_sec = ::mktime(&timedata);
     data.tv_usec = static_cast< suseconds_t >(microsecond);
-    return timestamp(std::tr1::shared_ptr< impl >(new impl(data)));
+    return timestamp(shared_ptr< impl >(new impl(data)));
 }
 
 
@@ -276,7 +276,7 @@ datetime::timestamp::now(void)
         INV(ret != -1);
     }
 
-    return timestamp(std::tr1::shared_ptr< impl >(new impl(data)));
+    return timestamp(shared_ptr< impl >(new impl(data)));
 }
 
 

$NetBSD: patch-utils_datetime.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/datetime.hpp.orig	2013-05-06 07:34:28.000000000 +0000
+++ utils/datetime.hpp
@@ -40,7 +40,13 @@ extern "C" {
 #include <ostream>
 #include <string>
 
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
 #include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 
 namespace utils {
 namespace datetime {
@@ -81,9 +87,9 @@ class timestamp {
     struct impl;
 
     /// Pointer to the shared internal implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
-    timestamp(std::tr1::shared_ptr< impl >);
+    timestamp(shared_ptr< impl >);
 
 public:
     static timestamp from_microseconds(const int64_t);

$NetBSD: patch-utils_format_exceptions.cpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/format/exceptions.cpp.orig	2013-05-06 08:20:35.000000000 +0000
+++ utils/format/exceptions.cpp
@@ -26,6 +26,7 @@
 // (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 <string>
 #include "utils/format/exceptions.hpp"
 
 using utils::format::bad_format_error;

$NetBSD: patch-utils_format_exceptions.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/format/exceptions.hpp.orig	2013-05-06 08:27:56.000000000 +0000
+++ utils/format/exceptions.hpp
@@ -33,6 +33,7 @@
 #define UTILS_FORMAT_EXCEPTIONS_HPP
 
 #include <stdexcept>
+#include <string>
 
 namespace utils {
 namespace format {

$NetBSD: patch-utils_fs_auto__cleaners.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/fs/auto_cleaners.hpp.orig	2013-05-06 08:10:18.000000000 +0000
+++ utils/fs/auto_cleaners.hpp
@@ -33,7 +33,13 @@
 #define UTILS_FS_AUTO_CLEANERS_HPP
 
 #include <string>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
 #include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 
 #include "utils/fs/path.hpp"
 
@@ -48,7 +54,7 @@ namespace fs {
 class auto_directory {
     struct impl;
     /// Reference-counted, shared implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
 public:
     explicit auto_directory(const path&);
@@ -68,7 +74,7 @@ public:
 class auto_file {
     struct impl;
     /// Reference-counted, shared implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
 public:
     explicit auto_file(const path&);

$NetBSD: patch-utils_fs_exceptions.cpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/fs/exceptions.cpp.orig	2013-05-06 08:21:29.000000000 +0000
+++ utils/fs/exceptions.cpp
@@ -29,6 +29,7 @@
 #include "utils/fs/exceptions.hpp"
 
 #include <cstring>
+#include <string>
 
 #include "utils/format/macros.hpp"
 

$NetBSD: patch-utils_fs_exceptions.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/fs/exceptions.hpp.orig	2013-05-06 08:21:46.000000000 +0000
+++ utils/fs/exceptions.hpp
@@ -33,6 +33,7 @@
 #define UTILS_FS_EXCEPTIONS_HPP
 
 #include <stdexcept>
+#include <string>
 
 namespace utils {
 namespace fs {

$NetBSD: patch-utils_sqlite_database.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/sqlite/database.hpp.orig	2013-05-06 07:46:57.000000000 +0000
+++ utils/sqlite/database.hpp
@@ -40,7 +40,13 @@ extern "C" {
 }
 
 #include <cstddef>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
 #include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 
 #include "utils/fs/path.hpp"
 
@@ -79,7 +85,7 @@ class database {
     struct impl;
 
     /// Pointer to the shared internal implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
     friend class database_c_gate;
     database(void*, const bool);

$NetBSD: patch-utils_sqlite_statement.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/sqlite/statement.hpp.orig	2013-05-06 08:04:34.000000000 +0000
+++ utils/sqlite/statement.hpp
@@ -40,7 +40,13 @@ extern "C" {
 }
 
 #include <string>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
 #include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 
 namespace utils {
 namespace sqlite {
@@ -92,7 +98,7 @@ class statement {
     struct impl;
 
     /// Pointer to the shared internal implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
     statement(database&, void*);
     friend class database;

$NetBSD: patch-utils_sqlite_transaction.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $

--- utils/sqlite/transaction.hpp.orig	2013-05-06 08:10:32.000000000 +0000
+++ utils/sqlite/transaction.hpp
@@ -32,7 +32,14 @@
 #if !defined(UTILS_SQLITE_TRANSACTION_HPP)
 #define UTILS_SQLITE_TRANSACTION_HPP
 
+#include <ciso646>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <memory>
+using std::shared_ptr;
+#else
 #include <tr1/memory>
+using std::tr1::shared_ptr;
+#endif
 
 namespace utils {
 namespace sqlite {
@@ -49,7 +56,7 @@ class transaction {
     struct impl;
 
     /// Pointer to the shared internal implementation.
-    std::tr1::shared_ptr< impl > _pimpl;
+    shared_ptr< impl > _pimpl;
 
     explicit transaction(database&);
     friend class database;