diff --git a/lib/base/array-script.cpp b/lib/base/array-script.cpp index 089fa3f67f6..3f83dd93465 100644 --- a/lib/base/array-script.cpp +++ b/lib/base/array-script.cpp @@ -30,7 +30,7 @@ static double ArrayLen() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->GetLength(); } @@ -38,7 +38,7 @@ static void ArraySet(int index, const Value& value) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); self->Set(index, value); } @@ -46,7 +46,7 @@ static Value ArrayGet(int index) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->Get(index); } @@ -54,7 +54,7 @@ static void ArrayAdd(const Value& value) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); self->Add(value); } @@ -62,7 +62,7 @@ static void ArrayRemove(int index) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); self->Remove(index); } @@ -70,7 +70,7 @@ static bool ArrayContains(const Value& value) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->Contains(value); } @@ -78,7 +78,7 @@ static void ArrayClear() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); self->Clear(); } @@ -91,7 +91,7 @@ static Array::Ptr ArraySort(const std::vector& args) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); Array::Ptr arr = self->ShallowClone(); @@ -115,7 +115,7 @@ static Array::Ptr ArrayShallowClone() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->ShallowClone(); } @@ -123,7 +123,7 @@ static Value ArrayJoin(const Value& separator) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); Value result; bool first = true; @@ -146,7 +146,7 @@ static Array::Ptr ArrayReverse() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->Reverse(); } @@ -154,7 +154,7 @@ static Array::Ptr ArrayMap(const Function::Ptr& function) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); if (vframe->Sandboxed && !function->IsSideEffectFree()) BOOST_THROW_EXCEPTION(ScriptError("Map function must be side-effect free.")); @@ -173,7 +173,7 @@ static Value ArrayReduce(const Function::Ptr& function) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); if (vframe->Sandboxed && !function->IsSideEffectFree()) BOOST_THROW_EXCEPTION(ScriptError("Reduce function must be side-effect free.")); @@ -195,7 +195,7 @@ static Array::Ptr ArrayFilter(const Function::Ptr& function) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); if (vframe->Sandboxed && !function->IsSideEffectFree()) BOOST_THROW_EXCEPTION(ScriptError("Filter function must be side-effect free.")); @@ -215,7 +215,7 @@ static bool ArrayAny(const Function::Ptr& function) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); if (vframe->Sandboxed && !function->IsSideEffectFree()) BOOST_THROW_EXCEPTION(ScriptError("Filter function must be side-effect free.")); @@ -233,7 +233,7 @@ static bool ArrayAll(const Function::Ptr& function) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); if (vframe->Sandboxed && !function->IsSideEffectFree()) BOOST_THROW_EXCEPTION(ScriptError("Filter function must be side-effect free.")); @@ -250,7 +250,7 @@ static Array::Ptr ArrayUnique() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Array::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); std::set result; diff --git a/lib/base/configobject-script.cpp b/lib/base/configobject-script.cpp index 7ca590d57a5..9f615eca732 100644 --- a/lib/base/configobject-script.cpp +++ b/lib/base/configobject-script.cpp @@ -29,7 +29,7 @@ static void ConfigObjectModifyAttribute(const String& attr, const Value& value) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); ConfigObject::Ptr self = vframe->Self; - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->ModifyAttribute(attr, value); } @@ -37,7 +37,7 @@ static void ConfigObjectRestoreAttribute(const String& attr) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); ConfigObject::Ptr self = vframe->Self; - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->RestoreAttribute(attr); } diff --git a/lib/base/datetime-script.cpp b/lib/base/datetime-script.cpp index 1a3a407915f..c26177af113 100644 --- a/lib/base/datetime-script.cpp +++ b/lib/base/datetime-script.cpp @@ -29,7 +29,7 @@ static String DateTimeFormat(const String& format) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); DateTime::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->Format(format); } diff --git a/lib/base/dictionary-script.cpp b/lib/base/dictionary-script.cpp index 709e7304f68..d188119e5d3 100644 --- a/lib/base/dictionary-script.cpp +++ b/lib/base/dictionary-script.cpp @@ -29,7 +29,7 @@ static double DictionaryLen() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->GetLength(); } @@ -37,7 +37,7 @@ static void DictionarySet(const String& key, const Value& value) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); self->Set(key, value); } @@ -45,7 +45,7 @@ static Value DictionaryGet(const String& key) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->Get(key); } @@ -53,7 +53,7 @@ static void DictionaryRemove(const String& key) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); self->Remove(key); } @@ -61,7 +61,7 @@ static bool DictionaryContains(const String& key) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->Contains(key); } @@ -69,7 +69,7 @@ static Dictionary::Ptr DictionaryShallowClone() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->ShallowClone(); } @@ -77,7 +77,7 @@ static Array::Ptr DictionaryKeys() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); ArrayData keys; ObjectLock olock(self); @@ -91,7 +91,7 @@ static Array::Ptr DictionaryValues() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Dictionary::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); ArrayData values; ObjectLock olock(self); diff --git a/lib/base/function-script.cpp b/lib/base/function-script.cpp index a11fde1c8a5..8a96b26f250 100644 --- a/lib/base/function-script.cpp +++ b/lib/base/function-script.cpp @@ -32,7 +32,7 @@ static Value FunctionCall(const std::vector& args) ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Function::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); std::vector uargs(args.begin() + 1, args.end()); return self->InvokeThis(args[0], uargs); @@ -42,7 +42,7 @@ static Value FunctionCallV(const Value& thisArg, const Array::Ptr& args) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Function::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); std::vector uargs; diff --git a/lib/base/object-script.cpp b/lib/base/object-script.cpp index 3b198f6f7c3..6db6374e811 100644 --- a/lib/base/object-script.cpp +++ b/lib/base/object-script.cpp @@ -29,7 +29,7 @@ static String ObjectToString() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Object::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->ToString(); } @@ -37,7 +37,7 @@ static void ObjectNotifyAttribute(const String& attribute) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Object::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); self->NotifyField(self->GetReflectionType()->GetFieldId(attribute)); } @@ -45,7 +45,7 @@ static Object::Ptr ObjectClone() { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Object::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); return self->Clone(); } diff --git a/lib/base/object.cpp b/lib/base/object.cpp index 007ef3eb27b..b1fff79d2d7 100644 --- a/lib/base/object.cpp +++ b/lib/base/object.cpp @@ -295,4 +295,4 @@ void icinga::RequireNotNullInternal(const intrusive_ptr& object, const c { if (!object) BOOST_THROW_EXCEPTION(std::invalid_argument("Pointer must not be null: " + String(description))); -} \ No newline at end of file +} diff --git a/lib/base/object.hpp b/lib/base/object.hpp index 9904421e5aa..a29e4f73b30 100644 --- a/lib/base/object.hpp +++ b/lib/base/object.hpp @@ -57,7 +57,7 @@ extern Value Empty; DECLARE_PTR_TYPEDEFS(klass); \ IMPL_TYPE_LOOKUP(); -#define RequireNotNull(ptr) RequireNotNullInternal(ptr, #ptr) +#define REQUIRE_NOT_NULL(ptr) RequireNotNullInternal(ptr, #ptr) void RequireNotNullInternal(const intrusive_ptr& object, const char *description); diff --git a/lib/base/typetype-script.cpp b/lib/base/typetype-script.cpp index 9cef98f55fb..88ebe3c9278 100644 --- a/lib/base/typetype-script.cpp +++ b/lib/base/typetype-script.cpp @@ -35,7 +35,7 @@ static void TypeRegisterAttributeHandler(const String& fieldName, const Function { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Type::Ptr self = static_cast(vframe->Self); - RequireNotNull(self); + REQUIRE_NOT_NULL(self); int fid = self->GetFieldId(fieldName); self->RegisterAttributeHandler(fid, std::bind(&InvokeAttributeHandlerHelper, callback, _1, _2)); diff --git a/lib/icinga/checkable-script.cpp b/lib/icinga/checkable-script.cpp index e1384e2c638..532fb58dd16 100644 --- a/lib/icinga/checkable-script.cpp +++ b/lib/icinga/checkable-script.cpp @@ -30,7 +30,7 @@ static void CheckableProcessCheckResult(const CheckResult::Ptr& cr) { ScriptFrame *vframe = ScriptFrame::GetCurrentFrame(); Checkable::Ptr self = vframe->Self; - RequireNotNull(self); + REQUIRE_NOT_NULL(self); self->ProcessCheckResult(cr); } diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp index f4dda9a35f1..d99f7649d4c 100644 --- a/lib/icinga/macroprocessor.cpp +++ b/lib/icinga/macroprocessor.cpp @@ -38,7 +38,7 @@ Value MacroProcessor::ResolveMacros(const Value& str, const ResolverList& resolv bool useResolvedMacros, int recursionLevel) { if (useResolvedMacros) - RequireNotNull(resolvedMacros); + REQUIRE_NOT_NULL(resolvedMacros); Value result; @@ -440,7 +440,7 @@ Value MacroProcessor::ResolveArguments(const Value& command, const Dictionary::P const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros, int recursionLevel) { if (useResolvedMacros) - RequireNotNull(resolvedMacros); + REQUIRE_NOT_NULL(resolvedMacros); Value resolvedCommand; if (!arguments || command.IsObjectType() || command.IsObjectType()) diff --git a/lib/methods/clusterchecktask.cpp b/lib/methods/clusterchecktask.cpp index b54a9ac75ad..7473eb1ad3f 100644 --- a/lib/methods/clusterchecktask.cpp +++ b/lib/methods/clusterchecktask.cpp @@ -38,8 +38,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, ClusterCheck, &ClusterCheckTask::ScriptFunc void ClusterCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - RequireNotNull(checkable); - RequireNotNull(cr); + REQUIRE_NOT_NULL(checkable); + REQUIRE_NOT_NULL(cr); if (resolvedMacros && !useResolvedMacros) return; diff --git a/lib/methods/clusterzonechecktask.cpp b/lib/methods/clusterzonechecktask.cpp index 08e77b6e55b..76a6fb2b294 100644 --- a/lib/methods/clusterzonechecktask.cpp +++ b/lib/methods/clusterzonechecktask.cpp @@ -34,8 +34,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, ClusterZoneCheck, &ClusterZoneCheckTask::Sc void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - RequireNotNull(checkable); - RequireNotNull(cr); + REQUIRE_NOT_NULL(checkable); + REQUIRE_NOT_NULL(cr); ApiListener::Ptr listener = ApiListener::GetInstance(); diff --git a/lib/methods/dummychecktask.cpp b/lib/methods/dummychecktask.cpp index 32955f92c23..516cc23eaae 100644 --- a/lib/methods/dummychecktask.cpp +++ b/lib/methods/dummychecktask.cpp @@ -36,8 +36,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, DummyCheck, &DummyCheckTask::ScriptFunc, "c void DummyCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - RequireNotNull(checkable); - RequireNotNull(cr); + REQUIRE_NOT_NULL(checkable); + REQUIRE_NOT_NULL(cr); CheckCommand::Ptr commandObj = checkable->GetCheckCommand(); diff --git a/lib/methods/exceptionchecktask.cpp b/lib/methods/exceptionchecktask.cpp index aabeb107c54..cb5ce76df91 100644 --- a/lib/methods/exceptionchecktask.cpp +++ b/lib/methods/exceptionchecktask.cpp @@ -34,8 +34,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, ExceptionCheck, &ExceptionCheckTask::Script void ExceptionCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - RequireNotNull(checkable); - RequireNotNull(cr); + REQUIRE_NOT_NULL(checkable); + REQUIRE_NOT_NULL(cr); if (resolvedMacros && !useResolvedMacros) return; diff --git a/lib/methods/icingachecktask.cpp b/lib/methods/icingachecktask.cpp index 98056d3d46d..5eca99b3faa 100644 --- a/lib/methods/icingachecktask.cpp +++ b/lib/methods/icingachecktask.cpp @@ -38,8 +38,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, IcingaCheck, &IcingaCheckTask::ScriptFunc, void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - RequireNotNull(checkable); - RequireNotNull(cr); + REQUIRE_NOT_NULL(checkable); + REQUIRE_NOT_NULL(cr); CheckCommand::Ptr commandObj = checkable->GetCheckCommand(); diff --git a/lib/methods/nullchecktask.cpp b/lib/methods/nullchecktask.cpp index 0e6f6414204..df99c338ee4 100644 --- a/lib/methods/nullchecktask.cpp +++ b/lib/methods/nullchecktask.cpp @@ -35,8 +35,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, NullCheck, &NullCheckTask::ScriptFunc, "che void NullCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - RequireNotNull(checkable); - RequireNotNull(cr); + REQUIRE_NOT_NULL(checkable); + REQUIRE_NOT_NULL(cr); if (resolvedMacros && !useResolvedMacros) return; diff --git a/lib/methods/nulleventtask.cpp b/lib/methods/nulleventtask.cpp index ab64a2f7e62..e515d31e8a1 100644 --- a/lib/methods/nulleventtask.cpp +++ b/lib/methods/nulleventtask.cpp @@ -27,5 +27,5 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, NullEvent, &NullEventTask::ScriptFunc, "che void NullEventTask::ScriptFunc(const Checkable::Ptr& checkable, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - RequireNotNull(checkable); + REQUIRE_NOT_NULL(checkable); } diff --git a/lib/methods/pluginchecktask.cpp b/lib/methods/pluginchecktask.cpp index 885f81fbeae..b98eec4a745 100644 --- a/lib/methods/pluginchecktask.cpp +++ b/lib/methods/pluginchecktask.cpp @@ -36,8 +36,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, PluginCheck, &PluginCheckTask::ScriptFunc, void PluginCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - RequireNotNull(checkable); - RequireNotNull(cr); + REQUIRE_NOT_NULL(checkable); + REQUIRE_NOT_NULL(cr); CheckCommand::Ptr commandObj = checkable->GetCheckCommand(); diff --git a/lib/methods/plugineventtask.cpp b/lib/methods/plugineventtask.cpp index 40cafb98eae..b8d5d7afe6d 100644 --- a/lib/methods/plugineventtask.cpp +++ b/lib/methods/plugineventtask.cpp @@ -36,7 +36,7 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, PluginEvent, &PluginEventTask::ScriptFunc, void PluginEventTask::ScriptFunc(const Checkable::Ptr& checkable, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - RequireNotNull(checkable); + REQUIRE_NOT_NULL(checkable); EventCommand::Ptr commandObj = checkable->GetEventCommand(); diff --git a/lib/methods/pluginnotificationtask.cpp b/lib/methods/pluginnotificationtask.cpp index 8566eda7f23..c33d29e55cd 100644 --- a/lib/methods/pluginnotificationtask.cpp +++ b/lib/methods/pluginnotificationtask.cpp @@ -39,8 +39,8 @@ void PluginNotificationTask::ScriptFunc(const Notification::Ptr& notification, const String& author, const String& comment, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - RequireNotNull(notification); - RequireNotNull(user); + REQUIRE_NOT_NULL(notification); + REQUIRE_NOT_NULL(user); NotificationCommand::Ptr commandObj = notification->GetCommand(); diff --git a/lib/methods/randomchecktask.cpp b/lib/methods/randomchecktask.cpp index d041b17f7eb..bdf2d54d473 100644 --- a/lib/methods/randomchecktask.cpp +++ b/lib/methods/randomchecktask.cpp @@ -34,8 +34,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, RandomCheck, &RandomCheckTask::ScriptFunc, void RandomCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros) { - RequireNotNull(checkable); - RequireNotNull(cr); + REQUIRE_NOT_NULL(checkable); + REQUIRE_NOT_NULL(cr); if (resolvedMacros && !useResolvedMacros) return; diff --git a/lib/methods/timeperiodtask.cpp b/lib/methods/timeperiodtask.cpp index a6554b3ce78..152139e389d 100644 --- a/lib/methods/timeperiodtask.cpp +++ b/lib/methods/timeperiodtask.cpp @@ -27,7 +27,7 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, EvenMinutesTimePeriod, &TimePeriodTask::Eve Array::Ptr TimePeriodTask::EmptyTimePeriodUpdate(const TimePeriod::Ptr& tp, double, double) { - RequireNotNull(tp); + REQUIRE_NOT_NULL(tp); Array::Ptr segments = new Array(); return segments; @@ -35,7 +35,7 @@ Array::Ptr TimePeriodTask::EmptyTimePeriodUpdate(const TimePeriod::Ptr& tp, doub Array::Ptr TimePeriodTask::EvenMinutesTimePeriodUpdate(const TimePeriod::Ptr& tp, double begin, double end) { - RequireNotNull(tp); + REQUIRE_NOT_NULL(tp); ArrayData segments;