removing "include/make_unique.h" as it is not useful anymore

the initial reason for attracting attention, was that it made the build fail on certain conditions. updated documentation
bareos · Jul 11, 2022 · 4962da4 · 4962da4
1 parent 48e2177
commit 4962da4
Show file tree

Hide file tree

Showing 40 changed files with 26 additions and 132 deletions.
diff --git a/core/src/cats/sql_get.cc b/core/src/cats/sql_get.cc
@@ -38,7 +38,6 @@
 #  include "sql.h"
 #  include "lib/edit.h"
 #  include "lib/volume_session_info.h"
-#  include "include/make_unique.h"
 
 /* -----------------------------------------------------------------------
  *

diff --git a/core/src/dird/bsr.cc b/core/src/dird/bsr.cc
@@ -37,7 +37,6 @@
 #include "lib/berrno.h"
 #include "lib/edit.h"
 #include "lib/parse_conf.h"
-#include "include/make_unique.h"
 
 #include <algorithm>
 

diff --git a/core/src/dird/dbcopy/database_column_descriptions.cc b/core/src/dird/dbcopy/database_column_descriptions.cc
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2020-2020 Bareos GmbH & Co. KG
+   Copyright (C) 2020-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -22,7 +22,6 @@
 #include "include/bareos.h"
 #include "cats/cats.h"
 #include "dird/dbcopy/database_column_descriptions.h"
-#include "include/make_unique.h"
 #include "lib/util.h"
 
 #include <algorithm>

diff --git a/core/src/dird/dbcopy/database_import_mysql.cc b/core/src/dird/dbcopy/database_import_mysql.cc
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2020-2020 Bareos GmbH & Co. KG
+   Copyright (C) 2020-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -25,7 +25,6 @@
 #include "dird/dbcopy/database_table_descriptions.h"
 #include "dird/dbcopy/progress.h"
 #include "dird/dbcopy/row_data.h"
-#include "include/make_unique.h"
 
 #include <cassert>
 #include <chrono>

diff --git a/core/src/dird/dbcopy/database_table_descriptions.h b/core/src/dird/dbcopy/database_table_descriptions.h
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2020-2021 Bareos GmbH & Co. KG
+   Copyright (C) 2020-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -24,7 +24,6 @@
 
 #include "dird/dbcopy/database_column_descriptions.h"
 #include "dird/dbcopy/database_connection.h"
-#include "include/make_unique.h"
 
 #include <algorithm>
 #include <cctype>

diff --git a/core/src/dird/dbcopy/dbcopy.cc b/core/src/dird/dbcopy/dbcopy.cc
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2020-2020 Bareos GmbH & Co. KG
+   Copyright (C) 2020-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -32,7 +32,6 @@
 #include "dird/get_database_connection.h"
 #include "dird/jcr_private.h"
 #include "dird/job.h"
-#include "include/make_unique.h"
 #include "lib/parse_conf.h"
 #include "lib/util.h"
 

diff --git a/core/src/dird/dbcopy/progress.cc b/core/src/dird/dbcopy/progress.cc
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2020-2021 Bareos GmbH & Co. KG
+   Copyright (C) 2020-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -22,7 +22,6 @@
 #include "include/bareos.h"
 #include "cats/cats.h"
 #include "dird/dbcopy/progress.h"
-#include "include/make_unique.h"
 
 #include <array>
 #include <iomanip>

diff --git a/core/src/dird/job.cc b/core/src/dird/job.cc
@@ -70,7 +70,6 @@
 #include "lib/tree.h"
 #include "lib/util.h"
 #include "lib/watchdog.h"
-#include "include/make_unique.h"
 #include "include/protocol_types.h"
 
 namespace directordaemon {

diff --git a/core/src/dird/jobq.cc b/core/src/dird/jobq.cc
@@ -456,7 +456,7 @@ extern "C" void* jobq_server(void* arg)
       jcr->impl->SDJobStatus = 0;
       unlock_mutex(jq->mutex); /* release internal lock */
       FreeJcr(jcr);
-      free(je);          /* release job entry */
+      free(je);              /* release job entry */
       lock_mutex(jq->mutex); /* reacquire job queue lock */
     }
 

diff --git a/core/src/dird/scheduler.cc b/core/src/dird/scheduler.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2012 Planets Communications B.V.
-   Copyright (C) 2013-2020 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -39,7 +39,6 @@
 #include "dird/jcr_private.h"
 #include "dird/job.h"
 #include "dird/storage.h"
-#include "include/make_unique.h"
 #include "lib/parse_conf.h"
 
 class JobControlRecord;

diff --git a/core/src/dird/scheduler_job_item_queue.cc b/core/src/dird/scheduler_job_item_queue.cc
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2019-2020 Bareos GmbH & Co. KG
+   Copyright (C) 2019-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -21,7 +21,6 @@
 
 #include "include/bareos.h"
 #include "dird/dird_conf.h"
-#include "include/make_unique.h"
 #include "scheduler_job_item_queue.h"
 
 #include <iostream>

diff --git a/core/src/dird/scheduler_private.cc b/core/src/dird/scheduler_private.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2012 Planets Communications B.V.
-   Copyright (C) 2013-2020 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -34,7 +34,6 @@
 #include "dird/scheduler_system_time_source.h"
 #include "dird/scheduler_time_adapter.h"
 #include "dird/storage.h"
-#include "include/make_unique.h"
 #include "lib/parse_conf.h"
 
 #include <chrono>

diff --git a/core/src/dird/ua_restore.cc b/core/src/dird/ua_restore.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2002-2011 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2016 Planets Communications B.V.
-   Copyright (C) 2013-2021 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -49,7 +49,6 @@
 #include "lib/berrno.h"
 #include "lib/parse_conf.h"
 #include "lib/tree.h"
-#include "include/make_unique.h"
 #include "include/protocol_types.h"
 
 namespace directordaemon {

diff --git a/core/src/dird/ua_status.cc b/core/src/dird/ua_status.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2001-2012 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2016 Planets Communications B.V.
-   Copyright (C) 2013-2021 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -50,8 +50,6 @@
 #include "lib/parse_conf.h"
 #include "lib/util.h"
 
-#include "include/make_unique.h"
-
 #include <memory>
 
 #define DEFAULT_STATUS_SCHED_DAYS 7

diff --git a/core/src/dird/vbackup.cc b/core/src/dird/vbackup.cc
@@ -50,7 +50,6 @@
 #include "dird/vbackup.h"
 #include "lib/edit.h"
 #include "lib/util.h"
-#include "include/make_unique.h"
 #include "cats/sql.h"
 
 #include <algorithm>

diff --git a/core/src/filed/backup.cc b/core/src/filed/backup.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2012 Planets Communications B.V.
-   Copyright (C) 2013-2020 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -45,7 +45,6 @@
 #include "lib/btimers.h"
 #include "lib/parse_conf.h"
 #include "lib/util.h"
-#include "include/make_unique.h"
 
 namespace filedaemon {
 

diff --git a/core/src/filed/dir_cmd.cc b/core/src/filed/dir_cmd.cc
@@ -42,7 +42,6 @@
 #include "filed/verify.h"
 #include "findlib/enable_priv.h"
 #include "findlib/shadowing.h"
-#include "include/make_unique.h"
 #include "lib/berrno.h"
 #include "lib/bget_msg.h"
 #include "lib/bnet.h"

diff --git a/core/src/filed/restore.cc b/core/src/filed/restore.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2012 Planets Communications B.V.
-   Copyright (C) 2013-2021 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -44,7 +44,6 @@
 #include "lib/bsock.h"
 #include "lib/edit.h"
 #include "lib/parse_conf.h"
-#include "include/make_unique.h"
 
 #ifdef HAVE_WIN32
 #  include "win32/findlib/win32.h"

diff --git a/core/src/include/make_unique.h b/core/src/include/make_unique.h
diff --git a/core/src/lib/bnet_network_dump.cc b/core/src/lib/bnet_network_dump.cc
@@ -22,7 +22,6 @@
 #include "include/bareos.h"
 #include "bnet_network_dump.h"
 #include "bnet_network_dump_private.h"
-#include "include/make_unique.h"
 
 std::unique_ptr<BnetDump> BnetDump::Create(std::string own_qualified_name)
 {

diff --git a/core/src/lib/bnet_network_dump.h b/core/src/lib/bnet_network_dump.h
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2019-2019 Bareos GmbH & Co. KG
+   Copyright (C) 2019-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public

diff --git a/core/src/lib/bnet_network_dump_private.cc b/core/src/lib/bnet_network_dump_private.cc
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2019-2019 Bareos GmbH & Co. KG
+   Copyright (C) 2019-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public

diff --git a/core/src/lib/configured_tls_policy_getter.cc b/core/src/lib/configured_tls_policy_getter.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2012 Planets Communications B.V.
-   Copyright (C) 2013-2019 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -28,7 +28,6 @@
 #include "lib/ascii_control_characters.h"
 #include "lib/bstringlist.h"
 #include "lib/qualified_resource_name_type_converter.h"
-#include "include/make_unique.h"
 
 #include <algorithm>
 

diff --git a/core/src/lib/connection_pool.h b/core/src/lib/connection_pool.h
@@ -26,7 +26,7 @@
  */
 
 #ifndef BAREOS_LIB_CONNECTION_POOL_H_
-#  define BAREOS_LIB_CONNECTION_POOL_H_
+#define BAREOS_LIB_CONNECTION_POOL_H_
 
 template <typename T> class alist;
 class BareosSocket;

diff --git a/core/src/lib/thread_list.cc b/core/src/lib/thread_list.cc
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2019-2019 Bareos GmbH & Co. KG
+   Copyright (C) 2019-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -21,7 +21,6 @@
 
 #include "include/bareos.h"
 #include "include/jcr.h"
-#include "include/make_unique.h"
 #include "lib/berrno.h"
 #include "lib/bsock.h"
 #include "lib/thread_list.h"