diff options
Diffstat (limited to 'project2/common/environment.h')
| -rw-r--r-- | project2/common/environment.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/project2/common/environment.h b/project2/common/environment.h index af9f5dd..a7f8f4b 100644 --- a/project2/common/environment.h +++ b/project2/common/environment.h @@ -7,6 +7,7 @@ #include <boost/tuple/tuple.hpp> #include <boost/filesystem/path.hpp> #include "optionsSource.h" +#include "options.h" #include "exceptions.h" #include "scripts.h" @@ -29,14 +30,10 @@ class Environment { ScriptReaderPtr resolveScript(const std::string & group, const std::string & name, bool ii) const; + INITOPTIONS; private: - Options commonOptions; - virtual const Options & engineOptions() const = 0; - static const Environment * currentEnv; - int clLevel; - int slLevel; typedef std::vector<OptionsSourcePtr> ConfigsMap; ConfigsMap configs; typedef boost::tuple<const std::string, const std::string> ScriptKey; @@ -44,10 +41,12 @@ class Environment { mutable ScriptCache scriptCache; public: - std::string datasourceRoot; - std::string scriptNamespace; - std::string scriptNamespacePrefix; - time_t sessionTimeOut; + static int clLevel; + static int slLevel; + static std::string datasourceRoot; + static std::string scriptNamespace; + static std::string scriptNamespacePrefix; + static time_t sessionTimeOut; }; #endif |