diff options
Diffstat (limited to 'project2/common/environment.h')
-rw-r--r-- | project2/common/environment.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/project2/common/environment.h b/project2/common/environment.h index 0c33283..894b2f8 100644 --- a/project2/common/environment.h +++ b/project2/common/environment.h @@ -5,7 +5,7 @@ #include <glibmm/ustring.h> #include <boost/function.hpp> #include <boost/filesystem/path.hpp> -#include "options.h" +#include "optionsSource.h" #include "exceptions.h" #include "scripts.h" @@ -36,8 +36,10 @@ class Environment { static const Environment * currentEnv; - static int clLevel; - static int slLevel; + int clLevel; + int slLevel; + typedef std::vector<OptionsSourcePtr> ConfigsMap; + ConfigsMap configs; public: std::string datasourceRoot; |