Merge pull request #6999 from Icinga/bugfix/compiler-warnings

[icinga2] / lib / config / configcompiler.hpp

diff --git a/lib/config/configcompiler.hpp b/lib/config/configcompiler.hpp
index 3b7b1ae9776a97b8f13a6ccfebac80fe08a872b3..b89fdf05c5c6a6a95e2d5d36b4baddf37d817f3d 100644 (file)
--- a/lib/config/configcompiler.hpp
+++ b/lib/config/configcompiler.hpp
@@ -1,21 +1,4 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
- *                                                                            *
- * 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 CONFIGCOMPILER_H
 #define CONFIGCOMPILER_H
@@ -86,8 +69,8 @@ struct ZoneFragment
 class ConfigCompiler
 {
 public:
-       explicit ConfigCompiler(const String& path, std::istream *input,
-               const String& zone = String(), const String& package = String());
+       explicit ConfigCompiler(String path, std::istream *input,
+               String zone = String(), String package = String());
        virtual ~ConfigCompiler();
 
        std::unique_ptr<Expression> Compile();
@@ -109,6 +92,9 @@ public:
        void SetPackage(const String& package);
        String GetPackage() const;
 
+       void AddImport(const std::shared_ptr<Expression>& import);
+       std::vector<std::shared_ptr<Expression> > GetImports() const;
+
        static void CollectIncludes(std::vector<std::unique_ptr<Expression> >& expressions,
                const String& file, const String& zone, const String& package);
 
@@ -134,6 +120,7 @@ private:
        std::istream *m_Input;
        String m_Zone;
        String m_Package;
+       std::vector<std::shared_ptr<Expression> > m_Imports;
 
        void *m_Scanner;