Changeset 1ecd26f in nscp for service/channels.hpp

Timestamp:

01/03/11 08:21:00 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

e6792f3

Parents:

f7663c9

Message:

syncronized streams between 0.4.x and 0.3.x as well as improed the CMAke build *alot*

File:

• service/channels.hpp (modified) (6 diffs)

service/channels.hpp

@@ -53 +53 @@
       boost::unique_lock<boost::shared_mutex> writeLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(30));
       if (!writeLock.owns_lock()) {
-        log_error(__FILEW__, __LINE__, _T("Failed to get mutex: channels::remove_all"));
+        log_error(__FILE__, __LINE__, _T("Failed to get mutex: channels::remove_all"));
         return;
       }
@@ -63 +63 @@
       boost::unique_lock<boost::shared_mutex> writeLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(10));
       if (!writeLock.owns_lock()) {
-        log_error(__FILEW__, __LINE__, _T("Failed to get mutex in remove_plugin for plugin id: ") + ::to_wstring(id));
+        log_error(__FILE__, __LINE__, _T("Failed to get mutex in remove_plugin for plugin id: ") + ::to_wstring(id));
         return;
       }
@@ -83 +83 @@
       boost::unique_lock<boost::shared_mutex> writeLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(10));
       if (!writeLock.owns_lock()) {
-        log_error(__FILEW__, __LINE__, _T("Failed to get mutex: ") + channel);
+        log_error(__FILE__, __LINE__, _T("Failed to get mutex: ") + channel);
         return;
       }
@@ -96 +96 @@
       boost::shared_lock<boost::shared_mutex> readLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(5));
       if (!readLock.owns_lock()) {
-        log_error(__FILEW__, __LINE__, _T("Failed to get mutex"));
+        log_error(__FILE__, __LINE__, _T("Failed to get mutex"));
         return lst;
       }
@@ -109 +109 @@
       boost::shared_lock<boost::shared_mutex> readLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(5));
       if (!readLock.owns_lock()) {
-        log_error(__FILEW__, __LINE__, _T("Failed to get mutex: ") + channel);
+        log_error(__FILE__, __LINE__, _T("Failed to get mutex: ") + channel);
         throw channel_exception("Failed to get mutex (channel::get)");
       }
@@ -136 +136 @@
       return boost::algorithm::to_lower_copy(key);
     }
-    void log_error(std::wstring file, int line, std::wstring error) {
+    void log_error(std::string file, int line, std::wstring error) {
       if (logger_ != NULL)
         logger_->nsclient_log_error(file, line, error);