Replace boost::assign::list_of with initializer lists

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index 43a69e8934257d27da01db1d1fd0ba9361356b96..fd73169b6554ce82aa22acd797a512d48370d16d 100644 (file)
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -1568,5 +1568,5 @@ void Application::ValidateName(const String& value, const ValidationUtils& utils
        ObjectImpl<Application>::ValidateName(value, utils);
 
        if (value != "app")
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("name"), "Application object must be named 'app'."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "name" }, "Application object must be named 'app'."));
 }

diff --git a/lib/base/logger.cpp b/lib/base/logger.cpp
index e05fdbb539fba1212a79e96ce47cc3c4f2cf35c4..45cbfdf1c33982d6c364ce755550f89be5985cf1 100644 (file)
--- a/lib/base/logger.cpp
+++ b/lib/base/logger.cpp
@@ -220,6 +220,6 @@ void Logger::ValidateSeverity(const String& value, const ValidationUtils& utils)
        try {
                StringToSeverity(value);
        } catch (...) {
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("severity"), "Invalid severity specified: " + value));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "severity" }, "Invalid severity specified: " + value));
        }
 }

diff --git a/lib/base/sysloglogger.cpp b/lib/base/sysloglogger.cpp
index cbd4d5701382a056e2185a4798cb0dfebd86fc1d..9d43f38b3061376278f9aabb1d67269d9e4d8551 100644 (file)
--- a/lib/base/sysloglogger.cpp
+++ b/lib/base/sysloglogger.cpp
@@ -111,7 +111,7 @@ void SyslogLogger::ValidateFacility(const String& value, const ValidationUtils&
                try {
                        Convert::ToLong(value);
                } catch (const std::exception&) {
-                       BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("facility"), "Invalid facility specified."));
+                       BOOST_THROW_EXCEPTION(ValidationError(this, { "facility" }, "Invalid facility specified."));
                }
        }
 }

diff --git a/lib/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp
index 67561327a3f2725b0cb0c9993775a96dd86698af..f397500956cd9377945bbb4fdb890ba049b0e20b 100644 (file)
--- a/lib/compat/compatlogger.cpp
+++ b/lib/compat/compatlogger.cpp
@@ -604,6 +604,6 @@ void CompatLogger::ValidateRotationMethod(const String& value, const ValidationU
 
        if (value != "HOURLY" && value != "DAILY" &&
            value != "WEEKLY" && value != "MONTHLY" && value != "NONE") {
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("rotation_method"), "Rotation method '" + value + "' is invalid."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "rotation_method" }, "Rotation method '" + value + "' is invalid."));
        }
 }

diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp
index 96a744fdc139e3a796a633654614de30b2f095b7..a585016d9e3a6e2985b353b935081b594d5f1609 100644 (file)
--- a/lib/db_ido/dbconnection.cpp
+++ b/lib/db_ido/dbconnection.cpp
@@ -450,7 +450,7 @@ void DbConnection::ValidateFailoverTimeout(double value, const ValidationUtils&
        ObjectImpl<DbConnection>::ValidateFailoverTimeout(value, utils);
 
        if (value < 60)
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("failover_timeout"), "Failover timeout minimum is 60s."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "failover_timeout" }, "Failover timeout minimum is 60s."));
 }
 
 void DbConnection::ValidateCategories(const Array::Ptr& value, const ValidationUtils& utils)
@@ -463,7 +463,7 @@ void DbConnection::ValidateCategories(const Array::Ptr& value, const ValidationU
            DbCatAcknowledgement | DbCatComment | DbCatDowntime | DbCatEventHandler | DbCatExternalCommand |
            DbCatFlapping | DbCatLog | DbCatNotification | DbCatProgramStatus | DbCatRetention |
            DbCatStateHistory)) != 0)
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("categories"), "categories filter is invalid."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "categories" }, "categories filter is invalid."));
 }
 
 void DbConnection::IncreaseQueryCount(void)

diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index 1fbfa47ab1734bbef4f687edfca58630b2ebd19b..89bbf4a98d43a81fcd0f519bebecfe199cd7f40f 100644 (file)
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -64,7 +64,7 @@ void Checkable::OnAllConfigLoaded(void)
                Zone::Ptr cmdZone = endpoint->GetZone();
 
                if (checkableZone && cmdZone != checkableZone && cmdZone->GetParent() != checkableZone) {
-                       BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("command_endpoint"),
+                       BOOST_THROW_EXCEPTION(ValidationError(this, { "command_endpoint" },
                            "Command endpoint must be in zone '" + checkableZone->GetName() + "' or in a direct child zone thereof."));
                }
        }
@@ -193,7 +193,7 @@ void Checkable::ValidateCheckInterval(double value, const ValidationUtils& utils
        ObjectImpl<Checkable>::ValidateCheckInterval(value, utils);
 
        if (value <= 0)
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("check_interval"), "Interval must be greater than 0."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "check_interval" }, "Interval must be greater than 0."));
 }
 
 void Checkable::ValidateMaxCheckAttempts(int value, const ValidationUtils& utils)
@@ -201,5 +201,5 @@ void Checkable::ValidateMaxCheckAttempts(int value, const ValidationUtils& utils
        ObjectImpl<Checkable>::ValidateMaxCheckAttempts(value, utils);
 
        if (value <= 0)
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("max_check_attempts"), "Value must be greater than 0."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "max_check_attempts" }, "Value must be greater than 0."));
 }

diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp
index a127f92c6ab7c3aaa1093b698dff38e63ca67f23..8d8c936bc9d3742d16b1b756381f9b3ccf4a8a1f 100644 (file)
--- a/lib/icinga/command.cpp
+++ b/lib/icinga/command.cpp
@@ -38,7 +38,7 @@ void Command::Validate(int types, const ValidationUtils& utils)
 
        if (arguments) {
                if (!GetCommandLine().IsObjectType<Array>())
-                       BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("command"), "Attribute 'command' must be an array if the 'arguments' attribute is set."));
+                       BOOST_THROW_EXCEPTION(ValidationError(this, { "command" }, "Attribute 'command' must be an array if the 'arguments' attribute is set."));
 
                ObjectLock olock(arguments);
                for (const Dictionary::Pair& kv : arguments) {
@@ -52,18 +52,18 @@ void Command::Validate(int types, const ValidationUtils& utils)
                                        Value argvalue = argdict->Get("value");
 
                                        if (argvalue.IsString() && !MacroProcessor::ValidateMacroString(argvalue))
-                                               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of<String>("arguments")(kv.first)("value"), "Validation failed: Closing $ not found in macro format string '" + argvalue + "'."));
+                                               BOOST_THROW_EXCEPTION(ValidationError(this, { "arguments", kv.first, "value" }, "Validation failed: Closing $ not found in macro format string '" + argvalue + "'."));
                                }
 
                                if (argdict->Contains("set_if")) {
                                        Value argsetif = argdict->Get("set_if");
 
                                        if (argsetif.IsString() && !MacroProcessor::ValidateMacroString(argsetif))
-                                               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of<String>("arguments")(kv.first)("set_if"), "Closing $ not found in macro format string '" + argsetif + "'."));
+                                               BOOST_THROW_EXCEPTION(ValidationError(this, { "arguments", kv.first, "set_if" }, "Closing $ not found in macro format string '" + argsetif + "'."));
                                }
                        } else if (arginfo.IsString()) {
                                if (!MacroProcessor::ValidateMacroString(arginfo))
-                                       BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of<String>("arguments")(kv.first), "Closing $ not found in macro format string '" + arginfo + "'."));
+                                       BOOST_THROW_EXCEPTION(ValidationError(this, { "arguments", kv.first }, "Closing $ not found in macro format string '" + arginfo + "'."));
                        }
                }
        }
@@ -79,7 +79,7 @@ void Command::Validate(int types, const ValidationUtils& utils)
                                continue;
 
                        if (!MacroProcessor::ValidateMacroString(envval))
-                               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of<String>("env")(kv.first), "Closing $ not found in macro format string '" + envval + "'."));
+                               BOOST_THROW_EXCEPTION(ValidationError(this, { "env", kv.first }, "Closing $ not found in macro format string '" + envval + "'."));
                }
        }
 }

diff --git a/lib/icinga/dependency.cpp b/lib/icinga/dependency.cpp
index 601374a052ce3b792d08d3d3aa638b394df29d20..8aec486d2b086d83d93a03752a1451737859ced7 100644 (file)
--- a/lib/icinga/dependency.cpp
+++ b/lib/icinga/dependency.cpp
@@ -216,9 +216,9 @@ void Dependency::ValidateStates(const Array::Ptr& value, const ValidationUtils&
        int sfilter = FilterArrayToInt(value, Notification::GetStateFilterMap(), 0);
 
        if (GetParentServiceName().IsEmpty() && (sfilter & ~(StateFilterUp | StateFilterDown)) != 0)
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("states"), "State filter is invalid for host dependency."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "states" }, "State filter is invalid for host dependency."));
 
        if (!GetParentServiceName().IsEmpty() && (sfilter & ~(StateFilterOK | StateFilterWarning | StateFilterCritical | StateFilterUnknown)) != 0)
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("states"), "State filter is invalid for service dependency."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "states" }, "State filter is invalid for service dependency."));
 }
 

diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp
index 9c9903484042aa8639237bfd02ddc6e484becf4b..ed5697d4e67f86b5b3d591b7dcb9086476a0b92b 100644 (file)
--- a/lib/icinga/downtime.cpp
+++ b/lib/icinga/downtime.cpp
@@ -414,7 +414,7 @@ void Downtime::ValidateStartTime(const Timestamp& value, const ValidationUtils&
        ObjectImpl<Downtime>::ValidateStartTime(value, utils);
 
        if (value <= 0)
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("start_time"), "Start time must be greater than 0."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "start_time" }, "Start time must be greater than 0."));
 }
 
 void Downtime::ValidateEndTime(const Timestamp& value, const ValidationUtils& utils)
@@ -422,5 +422,5 @@ void Downtime::ValidateEndTime(const Timestamp& value, const ValidationUtils& ut
        ObjectImpl<Downtime>::ValidateEndTime(value, utils);
 
        if (value <= 0)
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("end_time"), "End time must be greater than 0."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "end_time" }, "End time must be greater than 0."));
 }

diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp
index c7755df27b7221c1db1e08d1afa3a10e41c13b8f..3df271c20f67f84b20666cfc3773411dd90cf59b 100644 (file)
--- a/lib/icinga/macroprocessor.cpp
+++ b/lib/icinga/macroprocessor.cpp
@@ -28,7 +28,6 @@
 #include "base/scriptframe.hpp"
 #include "base/convert.hpp"
 #include "base/exception.hpp"
-#include <boost/assign.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/classification.hpp>
@@ -376,7 +375,7 @@ void MacroProcessor::ValidateCustomVars(const ConfigObject::Ptr& object, const D
                                        continue;
 
                                if (!ValidateMacroString(kv_var.second))
-                                       BOOST_THROW_EXCEPTION(ValidationError(object.get(), boost::assign::list_of<String>("vars")(kv.first)(kv_var.first), "Closing $ not found in macro format string '" + kv_var.second + "'."));
+                                       BOOST_THROW_EXCEPTION(ValidationError(object.get(), { "vars", kv.first, kv_var.first }, "Closing $ not found in macro format string '" + kv_var.second + "'."));
                        }
                } else if (varval.IsObjectType<Array>()) {
                        /* check all array entries */
@@ -388,7 +387,7 @@ void MacroProcessor::ValidateCustomVars(const ConfigObject::Ptr& object, const D
                                        continue;
 
                                if (!ValidateMacroString(arrval)) {
-                                       BOOST_THROW_EXCEPTION(ValidationError(object.get(), boost::assign::list_of<String>("vars")(kv.first), "Closing $ not found in macro format string '" + arrval + "'."));
+                                       BOOST_THROW_EXCEPTION(ValidationError(object.get(), { "vars", kv.first }, "Closing $ not found in macro format string '" + arrval + "'."));
                                }
                        }
                } else {
@@ -396,7 +395,7 @@ void MacroProcessor::ValidateCustomVars(const ConfigObject::Ptr& object, const D
                                continue;
 
                        if (!ValidateMacroString(varval))
-                               BOOST_THROW_EXCEPTION(ValidationError(object.get(), boost::assign::list_of<String>("vars")(kv.first), "Closing $ not found in macro format string '" + varval + "'."));
+                               BOOST_THROW_EXCEPTION(ValidationError(object.get(), { "vars", kv.first }, "Closing $ not found in macro format string '" + varval + "'."));
                }
        }
 }

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index 1738bd35908738d7b03eb9eca98d2789b0f6e8bc..c9274905d2b6aabf9774f56f0a21e509a4b66c3f 100644 (file)
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -649,10 +649,10 @@ void Notification::ValidateStates(const Array::Ptr& value, const ValidationUtils
        int filter = FilterArrayToInt(value, GetStateFilterMap(), 0);
 
        if (GetServiceName().IsEmpty() && (filter == -1 || (filter & ~(StateFilterUp | StateFilterDown)) != 0))
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("states"), "State filter is invalid."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "states" }, "State filter is invalid."));
 
        if (!GetServiceName().IsEmpty() && (filter == -1 || (filter & ~(StateFilterOK | StateFilterWarning | StateFilterCritical | StateFilterUnknown)) != 0))
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("states"), "State filter is invalid."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "states" }, "State filter is invalid."));
 }
 
 void Notification::ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils)
@@ -664,7 +664,7 @@ void Notification::ValidateTypes(const Array::Ptr& value, const ValidationUtils&
        if (filter == -1 || (filter & ~(NotificationDowntimeStart | NotificationDowntimeEnd | NotificationDowntimeRemoved |
            NotificationCustom | NotificationAcknowledgement | NotificationProblem | NotificationRecovery |
            NotificationFlappingStart | NotificationFlappingEnd)) != 0)
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("types"), "Type filter is invalid."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "types" }, "Type filter is invalid."));
 }
 
 Endpoint::Ptr Notification::GetCommandEndpoint(void) const

diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp
index be980e68f9468a644d593a8850f3866814063613..3da8ec334f159f9b7d43fbb8dcb72d809c410d65 100644 (file)
--- a/lib/icinga/scheduleddowntime.cpp
+++ b/lib/icinga/scheduleddowntime.cpp
@@ -216,13 +216,13 @@ void ScheduledDowntime::ValidateRanges(const Dictionary::Ptr& value, const Valid
                        int stride;
                        LegacyTimePeriod::ParseTimeRange(kv.first, &begin_tm, &end_tm, &stride, &reference);
                } catch (const std::exception& ex) {
-                       BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("ranges"), "Invalid time specification '" + kv.first + "': " + ex.what()));
+                       BOOST_THROW_EXCEPTION(ValidationError(this, { "ranges" }, "Invalid time specification '" + kv.first + "': " + ex.what()));
                }
 
                try {
                        LegacyTimePeriod::ProcessTimeRanges(kv.second, &reference, segments);
                } catch (const std::exception& ex) {
-                       BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("ranges"), "Invalid time range definition '" + kv.second + "': " + ex.what()));
+                       BOOST_THROW_EXCEPTION(ValidationError(this, { "ranges" }, "Invalid time range definition '" + kv.second + "': " + ex.what()));
                }
        }
 }

diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp
index 004e67538a9b65c2e950d7280ed74a5779cc361a..8fdf1694c546f8e117c2fef2887700d75f2921e1 100644 (file)
--- a/lib/icinga/timeperiod.cpp
+++ b/lib/icinga/timeperiod.cpp
@@ -403,13 +403,13 @@ void TimePeriod::ValidateRanges(const Dictionary::Ptr& value, const ValidationUt
                        int stride;
                        LegacyTimePeriod::ParseTimeRange(kv.first, &begin_tm, &end_tm, &stride, &reference);
                } catch (const std::exception& ex) {
-                       BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("ranges"), "Invalid time specification '" + kv.first + "': " + ex.what()));
+                       BOOST_THROW_EXCEPTION(ValidationError(this, { "ranges" }, "Invalid time specification '" + kv.first + "': " + ex.what()));
                }
 
                try {
                        LegacyTimePeriod::ProcessTimeRanges(kv.second, &reference, segments);
                } catch (const std::exception& ex) {
-                       BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("ranges"), "Invalid time range definition '" + kv.second + "': " + ex.what()));
+                       BOOST_THROW_EXCEPTION(ValidationError(this, { "ranges" }, "Invalid time range definition '" + kv.second + "': " + ex.what()));
                }
        }
 }

diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index ce586da5892395a3fbf62ca8857e7162fec57961..3344226b35b4d158f83a833af5784813b5846c2b 100644 (file)
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -104,7 +104,7 @@ void User::ValidateStates(const Array::Ptr& value, const ValidationUtils& utils)
        int filter = FilterArrayToInt(value, Notification::GetStateFilterMap(), 0);
 
        if (filter == -1 || (filter & ~(StateFilterUp | StateFilterDown | StateFilterOK | StateFilterWarning | StateFilterCritical | StateFilterUnknown)) != 0)
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("states"), "State filter is invalid."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "states" }, "State filter is invalid."));
 }
 
 void User::ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils)
@@ -116,5 +116,5 @@ void User::ValidateTypes(const Array::Ptr& value, const ValidationUtils& utils)
        if (filter == -1 || (filter & ~(NotificationDowntimeStart | NotificationDowntimeEnd | NotificationDowntimeRemoved |
            NotificationCustom | NotificationAcknowledgement | NotificationProblem | NotificationRecovery |
            NotificationFlappingStart | NotificationFlappingEnd)) != 0)
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("types"), "Type filter is invalid."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "types" }, "Type filter is invalid."));
 }

diff --git a/lib/livestatus/livestatuslistener.cpp b/lib/livestatus/livestatuslistener.cpp
index ae0cbc1e62baa4d379df030a3f056f104396b648..5d8d623006bace70941633c141df38153a897707 100644 (file)
--- a/lib/livestatus/livestatuslistener.cpp
+++ b/lib/livestatus/livestatuslistener.cpp
@@ -225,5 +225,5 @@ void LivestatusListener::ValidateSocketType(const String& value, const Validatio
        ObjectImpl<LivestatusListener>::ValidateSocketType(value, utils);
 
        if (value != "unix" && value != "tcp")
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("socket_type"), "Socket type '" + value + "' is invalid."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "socket_type" }, "Socket type '" + value + "' is invalid."));
 }

diff --git a/lib/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp
index 04aad230a720d86c36f5421e2ba310011a0ee64e..19d505bb639b9d09830b501d15920b3a4797178d 100644 (file)
--- a/lib/perfdata/graphitewriter.cpp
+++ b/lib/perfdata/graphitewriter.cpp
@@ -350,7 +350,7 @@ void GraphiteWriter::ValidateHostNameTemplate(const String& value, const Validat
        ObjectImpl<GraphiteWriter>::ValidateHostNameTemplate(value, utils);
 
        if (!MacroProcessor::ValidateMacroString(value))
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("host_name_template"), "Closing $ not found in macro format string '" + value + "'."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "host_name_template" }, "Closing $ not found in macro format string '" + value + "'."));
 }
 
 void GraphiteWriter::ValidateServiceNameTemplate(const String& value, const ValidationUtils& utils)
@@ -358,5 +358,5 @@ void GraphiteWriter::ValidateServiceNameTemplate(const String& value, const Vali
        ObjectImpl<GraphiteWriter>::ValidateServiceNameTemplate(value, utils);
 
        if (!MacroProcessor::ValidateMacroString(value))
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("service_name_template"), "Closing $ not found in macro format string '" + value + "'."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "service_name_template" }, "Closing $ not found in macro format string '" + value + "'."));
 }

diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
index fa08a69f37b909b40f9f64b4cb2c38a764706cef..0cb9f9ac5b278d5df57e9b475d0cf85e11e96a43 100644 (file)
--- a/lib/perfdata/influxdbwriter.cpp
+++ b/lib/perfdata/influxdbwriter.cpp
@@ -514,14 +514,14 @@ void InfluxdbWriter::ValidateHostTemplate(const Dictionary::Ptr& value, const Va
 
        String measurement = value->Get("measurement");
        if (!MacroProcessor::ValidateMacroString(measurement))
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("host_template")("measurement"), "Closing $ not found in macro format string '" + measurement + "'."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "host_template", "measurement" }, "Closing $ not found in macro format string '" + measurement + "'."));
 
        Dictionary::Ptr tags = value->Get("tags");
        if (tags) {
                ObjectLock olock(tags);
                for (const Dictionary::Pair& pair : tags) {
                        if (!MacroProcessor::ValidateMacroString(pair.second))
-                               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of<String>("host_template")("tags")(pair.first), "Closing $ not found in macro format string '" + pair.second));
+                               BOOST_THROW_EXCEPTION(ValidationError(this, { "host_template", "tags", pair.first }, "Closing $ not found in macro format string '" + pair.second));
                }
        }
 }
@@ -532,14 +532,14 @@ void InfluxdbWriter::ValidateServiceTemplate(const Dictionary::Ptr& value, const
 
        String measurement = value->Get("measurement");
        if (!MacroProcessor::ValidateMacroString(measurement))
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("service_template")("measurement"), "Closing $ not found in macro format string '" + measurement + "'."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "service_template", "measurement" }, "Closing $ not found in macro format string '" + measurement + "'."));
 
        Dictionary::Ptr tags = value->Get("tags");
        if (tags) {
                ObjectLock olock(tags);
                for (const Dictionary::Pair& pair : tags) {
                        if (!MacroProcessor::ValidateMacroString(pair.second))
-                               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of<String>("service_template")("tags")(pair.first), "Closing $ not found in macro format string '" + pair.second));
+                               BOOST_THROW_EXCEPTION(ValidationError(this, { "service_template", "tags", pair.first }, "Closing $ not found in macro format string '" + pair.second));
                }
        }
 }

diff --git a/lib/perfdata/perfdatawriter.cpp b/lib/perfdata/perfdatawriter.cpp
index 3200252ff6b4764bd8b476004341ee91eafd8266..46f9b7d5861e1611ad36ac43d77c3a459472efd9 100644 (file)
--- a/lib/perfdata/perfdatawriter.cpp
+++ b/lib/perfdata/perfdatawriter.cpp
@@ -163,7 +163,7 @@ void PerfdataWriter::ValidateHostFormatTemplate(const String& value, const Valid
        ObjectImpl<PerfdataWriter>::ValidateHostFormatTemplate(value, utils);
 
        if (!MacroProcessor::ValidateMacroString(value))
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("host_format_template"), "Closing $ not found in macro format string '" + value + "'."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "host_format_template" }, "Closing $ not found in macro format string '" + value + "'."));
 }
 
 void PerfdataWriter::ValidateServiceFormatTemplate(const String& value, const ValidationUtils& utils)
@@ -171,5 +171,5 @@ void PerfdataWriter::ValidateServiceFormatTemplate(const String& value, const Va
        ObjectImpl<PerfdataWriter>::ValidateServiceFormatTemplate(value, utils);
 
        if (!MacroProcessor::ValidateMacroString(value))
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("service_format_template"), "Closing $ not found in macro format string '" + value + "'."));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "service_format_template" }, "Closing $ not found in macro format string '" + value + "'."));
 }

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 60c75210d68583d64123e11363e836c6e29153ea..36bacd3be3f24fd09e963be7668b998741fff8c3 100644 (file)
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -1413,7 +1413,7 @@ void ApiListener::ValidateTlsProtocolmin(const String& value, const ValidationUt
                message += ", '" SSL_TXT_TLSV1_1 "' or '" SSL_TXT_TLSV1_2 "'";
 #endif /* SSL_TXT_TLSV1_1 */
 
-               BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("tls_protocolmin"), message));
+               BOOST_THROW_EXCEPTION(ValidationError(this, { "tls_protocolmin" }, message));
        }
 }
 

diff --git a/test/remote-url.cpp b/test/remote-url.cpp
index fce18d7ed5ad4455cae8c6ad54559baaf6ed2dc2..95297b9320529ea8411081627e3f47a1ec1416d0 100644 (file)
--- a/test/remote-url.cpp
+++ b/test/remote-url.cpp
@@ -20,7 +20,6 @@
 #include "base/array.hpp"
 #include "remote/url.hpp"
 #include <BoostTestTargetConfig.h>
-#include <boost/assign/list_of.hpp>
 
 using namespace icinga;
 
@@ -50,17 +49,16 @@ BOOST_AUTO_TEST_CASE(get_and_set)
        url->SetPassword("Seehofer");
        url->SetHost("koenigreich.bayern");
        url->SetPort("1918");
-       std::vector<String> p = boost::assign::list_of("path")("to")("münchen");
-       url->SetPath(p);
+       url->SetPath({ "path", "to", "münchen" });
 
        BOOST_CHECK(url->Format(false, true) == "ftp://Horst:Seehofer@koenigreich.bayern:1918/path/to/m%C3%BCnchen");
 
        std::map<String, std::vector<String> > m;
-       std::vector<String> v1 = boost::assign::list_of("hip")("hip")("hurra");
-       std::vector<String> v2 = boost::assign::list_of("äü^ä+#ül-");
-       std::vector<String> v3 = boost::assign::list_of("1")("2");
-       m.insert(std::pair<String, std::vector<String> >("shout", v1));
-       m.insert(std::pair<String, std::vector<String> >("sonderzeichen", v2));
+       std::vector<String> v1 { "hip", "hip", "hurra" };
+       std::vector<String> v2 { "äü^ä+#ül-" };
+       std::vector<String> v3 { "1", "2" };
+       m.emplace("shout", v1);
+       m.emplace("sonderzeichen", v2);
        url->SetQuery(m);
        url->SetQueryElements("count", v3);
        url->AddQueryElement("count", "3");