[#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 5201176bcf88753683789c1dc04a563a1e038070..e4e939cbbb339b68b5d82387c78ab06d30413d08 100644 (file)
--- 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 229bb5fd0a171c847ec6a1439813b3b72a295314..1247b4fc21a9c20219f57b7f63936a88a0f591c9 100644 (file)
--- 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 18775ac4f7a6ec5240d2223ad5ca0865dcca5779..3899fd283777006933ee2a3804562e729ba085ee 100644 (file)
--- 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 8bb59e099e44010b92f53a5542e5e8dc6ee94f00..c53ee404226da432050e565bda3966e0fc9ddbf7 100644 (file)
--- 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 92e1937cf319109c0b7d6d62d8f2484f4c22da30..8258bbe5e467370d8ce6d9c2d8a6cd9d86838ea8 100644 (file)
--- 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 b19406bbefc130ad9a0a8ff0838699064674cb5f..75d8191e3bd87ab530f1dc52ab5887e157fea600 100644 (file)
--- 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 e045e81de9f54f8eeed2d0e0ae4dfd506aea8ec3..c5ad6cad75a0e75b51f4b58f77058181d1593bf7 100644 (file)
--- 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 71d28c495f24bbe0e17dd0e37bf32809e14ed2ea..b43f2f15a0b8f5b96e0eb80f2a4445789e475d32 100644 (file)
--- 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 fe9d39e021810292f7e10b0369295dfd69a33e16..c39d49ddb7a4baf6a40db14abc67e60c7e0c6ce4 100644 (file)
--- 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 {