Merge pull request #6727 from Icinga/feature/cluster-config-sync-stage

[icinga2] / lib / icinga / macroresolver.hpp

diff --git a/lib/icinga/macroresolver.hpp b/lib/icinga/macroresolver.hpp
index 91631d4d73faecc712c92fe646f28163bc3a6ecd..ea29ce1e45c5fe02f37ea788d8c273541edcd43e 100644 (file)
--- a/lib/icinga/macroresolver.hpp
+++ b/lib/icinga/macroresolver.hpp
@@ -1,21 +1,4 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org)    *
- *                                                                            *
- * This program is free software; you can redistribute it and/or              *
- * modify it under the terms of the GNU General Public License                *
- * as published by the Free Software Foundation; either version 2             *
- * of the License, or (at your option) any later version.                     *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program; if not, write to the Free Software Foundation     *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
- ******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 #ifndef MACRORESOLVER_H
 #define MACRORESOLVER_H
@@ -33,12 +16,12 @@ namespace icinga
  *
  * @ingroup icinga
  */
-class I2_ICINGA_API MacroResolver
+class MacroResolver
 {
 public:
-       DECLARE_OBJECT(MacroResolver);
+       DECLARE_PTR_TYPEDEFS(MacroResolver);
 
-       virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, String *result) const = 0;
+       virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Value *result) const = 0;
 };
 
 }