Include the environment channel in verbose level 2

[builder.git] / source / config.h

diff --git a/source/config.h b/source/config.h
index 16094e0cb4a4e8ca0263ef34d6b5ac349fdae5e9..5c87eedf98d78644d3bf742f4791be7b697b6832 100644 (file)
--- a/source/config.h
+++ b/source/config.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef CONFIG_H_
 #define CONFIG_H_
 
@@ -38,11 +31,8 @@ public:
        typedef std::map<std::string, Option> OptionMap;
 
 private:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Config>
        {
-       private:
-               Config &conf;
-
        public:
                Loader(Config &);
        private:
@@ -53,6 +43,7 @@ private:
        OptionMap options;
        Msp::Time::TimeStamp mtime;
        bool freeze_mtime;
+       bool changed;
 
 public:
        Config(SourcePackage &);
@@ -73,8 +64,7 @@ public:
        present, the default profile is assumed. */
        void select_last_profile();
 
-       /** Selects a profile.  The profile cache file is updated, unless doing a
-       dry run. */
+       /** Selects a profile. */
        void select_profile(const std::string &);
 
        /** Processes options from the given raw option map.  Nonexistent options