[Openautomation-svn] SF.net SVN: openautomation:[697] xPLHAL/branches/thomas_s_dev/src

[<tho...@us...>]

Revision: 697
          http://openautomation.svn.sourceforge.net/openautomation/?rev=697&view=rev
Author:   thomas_s
Date:     2012-02-11 20:40:34 +0000 (Sat, 11 Feb 2012)
Log Message:
-----------
refactored code: used lock_guard in xplmessagequeue
deleted unused iterface class

Modified Paths:
--------------
    xPLHAL/branches/thomas_s_dev/src/xplmessagequeue.cpp
    xPLHAL/branches/thomas_s_dev/src/xplmessagequeue.h

Removed Paths:
-------------
    xPLHAL/branches/thomas_s_dev/src/i_properties.h

Deleted: xPLHAL/branches/thomas_s_dev/src/i_properties.h
===================================================================
--- xPLHAL/branches/thomas_s_dev/src/i_properties.h	2012-02-11 20:39:47 UTC (rev 696)
+++ xPLHAL/branches/thomas_s_dev/src/i_properties.h	2012-02-11 20:40:34 UTC (rev 697)
@@ -1,20 +0,0 @@
-#pragma once
-
-//! \brief Properties Interface
-class IProperties
-{
-    public:
-        virtual ~IProperties() {};
-
-        /** \returns true if the element name exists. */
-        virtual bool hasValue(const std::string& name) const = 0;
-
-        /** \returns the value of element name if it exists - or an empty std::string otherwise. */
-        virtual std::string getValue(const std::string& name) const = 0;
-
-        /** \brief sets value of property */
-        virtual void setValue(const std::string& name, const std::string& value) = 0;
-    
-        /** \brief deletes property */
-        virtual void deleteProperty(const std::string& name) = 0;
-};

Modified: xPLHAL/branches/thomas_s_dev/src/xplmessagequeue.cpp
===================================================================
--- xPLHAL/branches/thomas_s_dev/src/xplmessagequeue.cpp	2012-02-11 20:39:47 UTC (rev 696)
+++ xPLHAL/branches/thomas_s_dev/src/xplmessagequeue.cpp	2012-02-11 20:40:34 UTC (rev 697)
@@ -17,13 +17,15 @@
  */
 
 #include "log.h"
-
 #include "xplmessagequeue.h"
 
+using std::mutex;
+using std::lock_guard;
+
 void xPLMessageQueueClass::add( const xPLMessagePtr& message )
 {
     writeLog("xPLMessageQueueClass::add", logLevel::debug);
-    lock_guard locker( queueLock ); // get exclusive access to the queue
+    lock_guard<mutex> locker( queueLock ); // get exclusive access to the queue
     xPLMessages.push( message );
 }
 
@@ -31,7 +33,7 @@
 {
     xPLMessagePtr message;
     {
-        lock_guard locker( queueLock );   // get exclusive access to the queue
+        lock_guard<mutex> locker( queueLock );   // get exclusive access to the queue
         if( xPLMessages.empty() )
             return 0;
         message = xPLMessages.front();    // and release is as soon as possible

Modified: xPLHAL/branches/thomas_s_dev/src/xplmessagequeue.h
===================================================================
--- xPLHAL/branches/thomas_s_dev/src/xplmessagequeue.h	2012-02-11 20:39:47 UTC (rev 696)
+++ xPLHAL/branches/thomas_s_dev/src/xplmessagequeue.h	2012-02-11 20:40:34 UTC (rev 697)
@@ -20,11 +20,8 @@
 #include <vector>
 #include <queue>
 #include <string>
+#include <thread>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/locks.hpp>
-
 #include "xplmessage.h"
 
 /**
@@ -33,8 +30,7 @@
 class xPLMessageQueueClass
 {
     /** \brief variable to ensure that the queue is thread save... */
-    mutable boost::mutex queueLock;
-    typedef boost::lock_guard<boost::mutex> lock_guard;
+    mutable std::mutex queueLock;
     std::queue<xPLMessagePtr> xPLMessages;
 
   public:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.