Changeset 264
- Timestamp:
- Apr 30, 2007, 11:54:25 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bin/svndigest.cc
r235 r264 60 60 61 61 // Reading configuration file 62 Configuration* config = NULL;62 Configuration* config = Configuration::instance(); 63 63 if (node_exist(option->config_file())) { 64 64 std::ifstream is(option->config_file().c_str()); … … 69 69 exit(-1); 70 70 } 71 config = new Configuration(is);71 config->load(is); 72 72 is.close(); 73 73 } 74 74 else 75 config = new Configuration;75 config->load(); 76 76 assert(config); 77 77 -
trunk/lib/Configuration.cc
r229 r264 35 35 namespace svndigest{ 36 36 37 Configuration* Configuration::instance_=NULL; 38 39 37 40 Configuration::Configuration(void) 41 { 42 } 43 44 45 void Configuration::load(void) 38 46 { 39 47 set_default(); … … 41 49 42 50 43 Configuration::Configuration(std::istream& is)51 void Configuration::load(std::istream& is) 44 52 { 45 53 assert(is.good()); … … 66 74 } 67 75 } 76 } 77 78 79 Configuration* Configuration::instance(void) 80 { 81 if (!instance_) 82 instance_ = new Configuration; 83 return instance_; 68 84 } 69 85 -
trunk/lib/Configuration.h
r229 r264 25 25 */ 26 26 27 #include < fstream>27 #include <iostream> 28 28 #include <map> 29 29 #include <string> … … 35 35 { 36 36 public: 37 /// 38 /// Creates a Config object with default settings. 39 /// 40 /// @brief Default Constructor 41 /// 42 Configuration(void); 37 static Configuration* instance(void); 43 38 44 39 /// 45 /// @brief Stream Constructor40 /// @brief load deafult configuration 46 41 /// 47 Configuration(std::istream&); 42 void load(void); 43 44 /// 45 /// @brief load configuration from stream 46 /// 47 void load(std::istream&); 48 48 49 49 /// … … 54 54 55 55 private: 56 /// 57 /// Creates a Config object with default settings. 58 /// 59 /// @brief Default Constructor 60 /// 61 Configuration(void); 62 63 void clear(void); 64 56 65 void set_default(void); 66 67 static Configuration* instance_; 57 68 58 69 std::map<std::string, std::string> copyright_alias_;
Note: See TracChangeset
for help on using the changeset viewer.