Changeset 284

Timestamp:

08/22/10 09:05:21 (18 months ago)

Author:

mickem

Message:

A few unix related twekas

Location:

trunk

Files:

• include/settings/settings_core.hpp (modified) (1 diff)
• service/settings_client.hpp (modified) (1 diff)

trunk/include/settings/settings_core.hpp

@@ -36 +36 @@
 
 
-  template<class T>
-  struct instance_ptr_helper {
-    boost::shared_ptr<T> ptr_;
-    boost::unique_lock<boost::timed_mutex> *mutex_;
-    instance_ptr_helper(boost::shared_ptr<T> ptr, boost::timed_mutex &mutex, int timeout) : ptr_(ptr), mutex_(NULL) {
-      mutex_ = new boost::unique_lock<boost::timed_mutex>(mutex, boost::get_system_time() + boost::posix_time::seconds(timeout));
-      std::wcout << _T("creating (safe)...") << std::endl;
-      if (!mutex_->owns_lock())
-        throw settings_exception(_T("Failed to get mutex, cant get settings instance"));
-    }
-    instance_ptr_helper(boost::shared_ptr<T> ptr) : ptr_(ptr) {
-      std::wcout << _T("creating (unsafe)...") << std::endl;
-      delete mutex_;
-    }
-    ~instance_ptr_helper() {
-      std::wcout << _T("destroying...") << std::endl;
-    }
-    boost::shared_ptr<T> operator* () const {
-      return ptr_;
-    }
-
-    boost::shared_ptr<T> operator-> () const {
-      return ptr_;
-    }
-    bool operator! () const {
-      return !ptr_;
-    }
-  };
   class settings_exception {
     std::wstring error_;

trunk/service/settings_client.hpp

@@ -112 +112 @@
       } catch (settings::settings_exception e) {
         error_msg(_T("Failed to initialize settings: ") + e.getError());
+      } catch (std::exception &e) {
+        error_msg(_T("Failed to initialize settings: ") + to_wstring(e.what()));
       } catch (...) {
         error_msg(_T("FATAL ERROR IN SETTINGS SUBSYTEM"));