From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 25 Feb 2019 12:05:47 +0000 (+0100)
Subject: [#487,!242] Moved optional_value.h to optional.h
X-Git-Tag: 478-improve-error-message-database-backend-mysql_base~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f51d01aeca4f685a3330ee89d277e83f4c0a17e4;p=thirdparty%2Fkea.git

[#487,!242] Moved optional_value.h to optional.h
---

diff --git a/src/bin/dhcp4/tests/dhcp4_client.h b/src/bin/dhcp4/tests/dhcp4_client.h
index 5201176bcf..e4e939cbbb 100644
--- a/src/bin/dhcp4/tests/dhcp4_client.h
+++ b/src/bin/dhcp4/tests/dhcp4_client.h
@@ -12,7 +12,7 @@
 #include <dhcp/option.h>
 #include <dhcp/pkt4.h>
 #include <dhcp4/tests/dhcp4_test_utils.h>
-#include <util/optional_value.h>
+#include <util/optional.h>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <set>
diff --git a/src/lib/dhcp/iface_mgr.h b/src/lib/dhcp/iface_mgr.h
index 229bb5fd0a..1247b4fc21 100644
--- a/src/lib/dhcp/iface_mgr.h
+++ b/src/lib/dhcp/iface_mgr.h
@@ -16,7 +16,7 @@
 #include <dhcp/packet_queue_mgr6.h>
 #include <dhcp/pkt_filter.h>
 #include <dhcp/pkt_filter6.h>
-#include <util/optional_value.h>
+#include <util/optional.h>
 #include <util/watch_socket.h>
 #include <util/threads/watched_thread.h>
 
diff --git a/src/lib/dhcpsrv/cfg_subnets6.h b/src/lib/dhcpsrv/cfg_subnets6.h
index 18775ac4f7..3899fd2837 100644
--- a/src/lib/dhcpsrv/cfg_subnets6.h
+++ b/src/lib/dhcpsrv/cfg_subnets6.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2019 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
 #include <dhcpsrv/subnet.h>
 #include <dhcpsrv/subnet_id.h>
 #include <dhcpsrv/subnet_selector.h>
-#include <util/optional_value.h>
+#include <util/optional.h>
 #include <boost/shared_ptr.hpp>
 #include <string>
 
diff --git a/src/lib/dhcpsrv/mysql_host_data_source.cc b/src/lib/dhcpsrv/mysql_host_data_source.cc
index 8bb59e099e..c53ee40422 100644
--- a/src/lib/dhcpsrv/mysql_host_data_source.cc
+++ b/src/lib/dhcpsrv/mysql_host_data_source.cc
@@ -15,7 +15,7 @@
 #include <dhcpsrv/dhcpsrv_log.h>
 #include <dhcpsrv/mysql_host_data_source.h>
 #include <util/buffer.h>
-#include <util/optional_value.h>
+#include <util/optional.h>
 
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
diff --git a/src/lib/dhcpsrv/parsers/dhcp_parsers.h b/src/lib/dhcpsrv/parsers/dhcp_parsers.h
index 92e1937cf3..8258bbe5e4 100644
--- a/src/lib/dhcpsrv/parsers/dhcp_parsers.h
+++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -21,7 +21,7 @@
 #include <dhcpsrv/srv_config.h>
 #include <cc/simple_parser.h>
 #include <exceptions/exceptions.h>
-#include <util/optional_value.h>
+#include <util/optional.h>
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/src/lib/dhcpsrv/parsers/option_data_parser.h b/src/lib/dhcpsrv/parsers/option_data_parser.h
index b19406bbef..75d8191e3b 100644
--- a/src/lib/dhcpsrv/parsers/option_data_parser.h
+++ b/src/lib/dhcpsrv/parsers/option_data_parser.h
@@ -12,7 +12,7 @@
 #include <dhcp/option_definition.h>
 #include <dhcpsrv/cfg_option.h>
 #include <dhcpsrv/cfg_option_def.h>
-#include <util/optional_value.h>
+#include <util/optional.h>
 #include <cstdint>
 #include <string>
 #include <utility>
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index e045e81de9..c5ad6cad75 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -16,7 +16,7 @@ libkea_util_la_SOURCES += hash.h
 libkea_util_la_SOURCES += labeled_value.h labeled_value.cc
 libkea_util_la_SOURCES += memory_segment.h
 libkea_util_la_SOURCES += memory_segment_local.h memory_segment_local.cc
-libkea_util_la_SOURCES += optional_value.h
+libkea_util_la_SOURCES += optional.h
 libkea_util_la_SOURCES += pid_file.h pid_file.cc
 libkea_util_la_SOURCES += pointer_util.h
 libkea_util_la_SOURCES += process_spawn.h process_spawn.cc
@@ -58,7 +58,7 @@ libkea_util_include_HEADERS = \
 	labeled_value.h \
 	memory_segment.h \
 	memory_segment_local.h \
-	optional_value.h \
+	optional.h \
 	pid_file.h \
 	pointer_util.h \
 	process_spawn.h \
diff --git a/src/lib/util/optional_value.h b/src/lib/util/optional.h
similarity index 100%
rename from src/lib/util/optional_value.h
rename to src/lib/util/optional.h
diff --git a/src/lib/util/tests/Makefile.am b/src/lib/util/tests/Makefile.am
index 71d28c495f..b43f2f15a0 100644
--- a/src/lib/util/tests/Makefile.am
+++ b/src/lib/util/tests/Makefile.am
@@ -44,7 +44,7 @@ run_unittests_SOURCES += labeled_value_unittest.cc
 run_unittests_SOURCES += memory_segment_local_unittest.cc
 run_unittests_SOURCES += memory_segment_common_unittest.h
 run_unittests_SOURCES += memory_segment_common_unittest.cc
-run_unittests_SOURCES += optional_value_unittest.cc
+run_unittests_SOURCES += optional_unittest.cc
 run_unittests_SOURCES += pid_file_unittest.cc
 run_unittests_SOURCES += process_spawn_unittest.cc
 run_unittests_SOURCES += qid_gen_unittest.cc
diff --git a/src/lib/util/tests/optional_value_unittest.cc b/src/lib/util/tests/optional_unittest.cc
similarity index 98%
rename from src/lib/util/tests/optional_value_unittest.cc
rename to src/lib/util/tests/optional_unittest.cc
index fe9d39e021..c39d49ddb7 100644
--- a/src/lib/util/tests/optional_value_unittest.cc
+++ b/src/lib/util/tests/optional_unittest.cc
@@ -5,7 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <util/optional_value.h>
+#include <util/optional.h>
 #include <gtest/gtest.h>
 
 namespace {