Skip to content

Commit

Permalink
Remove compatibility header for std::shared_ptr, `utils/shared_ptr.…
Browse files Browse the repository at this point in the history
…hpp`

This compatibility header is not required with C++11 and newer. C++11 is now
required after bf8eb10.

This completes freebsd#152.

Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
  • Loading branch information
ngie-eign committed Mar 22, 2019
1 parent bf8eb10 commit 7205f73
Show file tree
Hide file tree
Showing 26 changed files with 25 additions and 71 deletions.
1 change: 0 additions & 1 deletion engine/scanner.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
#include "engine/filters_fwd.hpp"
#include "model/test_program_fwd.hpp"
#include "utils/optional_fwd.hpp"
#include "utils/shared_ptr.hpp"

namespace engine {

Expand Down
2 changes: 1 addition & 1 deletion engine/scheduler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ extern "C" {
#include <cstdio>
#include <cstdlib>
#include <fstream>
#include <memory>
#include <stdexcept>

#include "engine/config.hpp"
Expand All @@ -61,7 +62,6 @@ extern "C" {
#include "utils/process/executor.ipp"
#include "utils/process/status.hpp"
#include "utils/sanity.hpp"
#include "utils/shared_ptr.hpp"
#include "utils/stacktrace.hpp"
#include "utils/stream.hpp"
#include "utils/text/operations.ipp"
Expand Down
2 changes: 1 addition & 1 deletion engine/scheduler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@

#include "engine/scheduler_fwd.hpp"

#include <memory>
#include <set>
#include <string>

Expand All @@ -72,7 +73,6 @@
#include "utils/optional.hpp"
#include "utils/process/executor_fwd.hpp"
#include "utils/process/status_fwd.hpp"
#include "utils/shared_ptr.hpp"

namespace engine {
namespace scheduler {
Expand Down
2 changes: 1 addition & 1 deletion engine/scheduler_fwd.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#if !defined(ENGINE_SCHEDULER_FWD_HPP)
#define ENGINE_SCHEDULER_FWD_HPP

#include "utils/shared_ptr.hpp"
#include <memory>

namespace engine {
namespace scheduler {
Expand Down
2 changes: 1 addition & 1 deletion model/context.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
#include "model/context_fwd.hpp"

#include <map>
#include <memory>
#include <ostream>
#include <string>

#include "utils/fs/path_fwd.hpp"
#include "utils/shared_ptr.hpp"

namespace model {

Expand Down
1 change: 0 additions & 1 deletion model/metadata.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include "utils/datetime_fwd.hpp"
#include "utils/fs/path_fwd.hpp"
#include "utils/noncopyable.hpp"
#include "utils/shared_ptr.hpp"
#include "utils/units_fwd.hpp"

namespace model {
Expand Down
2 changes: 1 addition & 1 deletion model/test_case.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@

#include "model/test_case_fwd.hpp"

#include <memory>
#include <ostream>
#include <string>

#include "model/metadata_fwd.hpp"
#include "model/test_result_fwd.hpp"
#include "utils/noncopyable.hpp"
#include "utils/optional_fwd.hpp"
#include "utils/shared_ptr.hpp"

namespace model {

Expand Down
2 changes: 1 addition & 1 deletion model/test_program.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#include "model/test_program_fwd.hpp"

#include <memory>
#include <ostream>
#include <string>
#include <vector>
Expand All @@ -42,7 +43,6 @@
#include "model/test_case_fwd.hpp"
#include "utils/fs/path_fwd.hpp"
#include "utils/noncopyable.hpp"
#include "utils/shared_ptr.hpp"

namespace model {

Expand Down
2 changes: 1 addition & 1 deletion model/test_program_fwd.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
#if !defined(MODEL_TEST_PROGRAM_FWD_HPP)
#define MODEL_TEST_PROGRAM_FWD_HPP

#include <memory>
#include <vector>

#include "utils/shared_ptr.hpp"

namespace model {

Expand Down
3 changes: 2 additions & 1 deletion store/read_backend.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@

#include "store/read_backend_fwd.hpp"

#include <memory>

#include "store/read_transaction_fwd.hpp"
#include "utils/fs/path_fwd.hpp"
#include "utils/shared_ptr.hpp"
#include "utils/sqlite/database_fwd.hpp"

namespace store {
Expand Down
2 changes: 1 addition & 1 deletion store/read_transaction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ extern "C" {
#include <stdint.h>
}

#include <memory>
#include <string>

#include "model/context_fwd.hpp"
Expand All @@ -46,7 +47,6 @@ extern "C" {
#include "store/read_backend_fwd.hpp"
#include "store/read_transaction_fwd.hpp"
#include "utils/datetime_fwd.hpp"
#include "utils/shared_ptr.hpp"

namespace store {

Expand Down
3 changes: 2 additions & 1 deletion store/write_backend.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@

#include "store/write_backend_fwd.hpp"

#include <memory>

#include "store/metadata_fwd.hpp"
#include "store/write_transaction_fwd.hpp"
#include "utils/fs/path_fwd.hpp"
#include "utils/shared_ptr.hpp"
#include "utils/sqlite/database_fwd.hpp"

namespace store {
Expand Down
2 changes: 1 addition & 1 deletion store/write_transaction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ extern "C" {
#include <stdint.h>
}

#include <memory>
#include <string>

#include "model/context_fwd.hpp"
Expand All @@ -47,7 +48,6 @@ extern "C" {
#include "utils/datetime_fwd.hpp"
#include "utils/fs/path_fwd.hpp"
#include "utils/optional_fwd.hpp"
#include "utils/shared_ptr.hpp"

namespace store {

Expand Down
1 change: 0 additions & 1 deletion utils/Makefile.am.inc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ libutils_a_SOURCES += utils/passwd_fwd.hpp
libutils_a_SOURCES += utils/sanity.cpp
libutils_a_SOURCES += utils/sanity.hpp
libutils_a_SOURCES += utils/sanity_fwd.hpp
libutils_a_SOURCES += utils/shared_ptr.hpp
libutils_a_SOURCES += utils/stacktrace.cpp
libutils_a_SOURCES += utils/stacktrace.hpp
libutils_a_SOURCES += utils/stream.cpp
Expand Down
2 changes: 1 addition & 1 deletion utils/config/tree.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@

#include "utils/config/tree_fwd.hpp"

#include <memory>
#include <string>

#include <lutok/state.hpp>

#include "utils/config/keys_fwd.hpp"
#include "utils/config/nodes_fwd.hpp"
#include "utils/shared_ptr.hpp"

namespace utils {
namespace config {
Expand Down
2 changes: 1 addition & 1 deletion utils/datetime.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ extern "C" {
}

#include <cstddef>
#include <memory>
#include <ostream>
#include <string>

#include "utils/shared_ptr.hpp"

namespace utils {
namespace datetime {
Expand Down
2 changes: 1 addition & 1 deletion utils/format/containers.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
#define UTILS_FORMAT_CONTAINERS_HPP

#include <map>
#include <memory>
#include <ostream>
#include <set>
#include <utility>
#include <vector>

#include "utils/shared_ptr.hpp"

// This is ugly but necessary for C++ name resolution. Unsure if we'd do it
// differently...
Expand Down
2 changes: 1 addition & 1 deletion utils/format/containers_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

#include "utils/format/containers.ipp"

#include <memory>
#include <ostream>
#include <set>
#include <string>
Expand All @@ -36,7 +37,6 @@

#include <atf-c++.hpp>

#include "utils/shared_ptr.hpp"


namespace {
Expand Down
2 changes: 1 addition & 1 deletion utils/fs/auto_cleaners.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@

#include "utils/fs/auto_cleaners_fwd.hpp"

#include <memory>
#include <string>

#include "utils/fs/path_fwd.hpp"
#include "utils/shared_ptr.hpp"

namespace utils {
namespace fs {
Expand Down
2 changes: 1 addition & 1 deletion utils/fs/directory.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@

#include "utils/fs/directory_fwd.hpp"

#include <memory>
#include <ostream>
#include <string>

#include "utils/fs/path_fwd.hpp"
#include "utils/shared_ptr.hpp"

namespace utils {
namespace fs {
Expand Down
2 changes: 1 addition & 1 deletion utils/process/executor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@
#include "utils/process/executor_fwd.hpp"

#include <cstddef>
#include <memory>

#include "utils/datetime_fwd.hpp"
#include "utils/fs/path_fwd.hpp"
#include "utils/optional.hpp"
#include "utils/passwd_fwd.hpp"
#include "utils/process/child_fwd.hpp"
#include "utils/process/status_fwd.hpp"
#include "utils/shared_ptr.hpp"

namespace utils {
namespace process {
Expand Down
46 changes: 0 additions & 46 deletions utils/shared_ptr.hpp

This file was deleted.

2 changes: 1 addition & 1 deletion utils/sqlite/database.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ extern "C" {
}

#include <cstddef>
#include <memory>

#include "utils/fs/path_fwd.hpp"
#include "utils/optional_fwd.hpp"
#include "utils/shared_ptr.hpp"
#include "utils/sqlite/c_gate_fwd.hpp"
#include "utils/sqlite/statement_fwd.hpp"
#include "utils/sqlite/transaction_fwd.hpp"
Expand Down
2 changes: 1 addition & 1 deletion utils/sqlite/statement.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ extern "C" {
#include <stdint.h>
}

#include <memory>
#include <string>

#include "utils/sqlite/database_fwd.hpp"
#include "utils/shared_ptr.hpp"

namespace utils {
namespace sqlite {
Expand Down
3 changes: 2 additions & 1 deletion utils/sqlite/transaction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@

#include "utils/sqlite/transaction_fwd.hpp"

#include "utils/shared_ptr.hpp"
#include <memory>

#include "utils/sqlite/database_fwd.hpp"

namespace utils {
Expand Down
2 changes: 1 addition & 1 deletion utils/text/regex.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#include "utils/text/regex_fwd.hpp"

#include <cstddef>
#include <memory>

#include "utils/shared_ptr.hpp"

namespace utils {
namespace text {
Expand Down

0 comments on commit 7205f73

Please sign in to comment.