[asterisk-scf-commits] asterisk-scf/integration/ice-util-cpp.git branch "workqueue" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu May 5 10:55:13 CDT 2011


branch "workqueue" has been updated
       via  892a801b43194494dac29852d2da4b26c69c843a (commit)
      from  f7ff93946394a908997595fe8076a2496602a01f (commit)

Summary of changes:
 ThreadPool/include/AsteriskSCF/ThreadPool.h        |    2 +-
 ThreadPool/src/CMakeLists.txt                      |    2 +-
 ThreadPool/test/ProofOfConcept.cpp                 |    2 +-
 .../include/AsteriskSCF/DefaultQueueListener.h     |    3 ++-
 .../include/AsteriskSCF/SuspendableWorkQueue.h     |    2 +-
 WorkQueue/include/AsteriskSCF/WorkQueue.h          |    2 +-
 WorkQueue/src/CMakeLists.txt                       |    3 ++-
 7 files changed, 9 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 892a801b43194494dac29852d2da4b26c69c843a
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu May 5 10:48:04 2011 -0500

    Adding what is necessary to have a successful build on Windows.

diff --git a/ThreadPool/include/AsteriskSCF/ThreadPool.h b/ThreadPool/include/AsteriskSCF/ThreadPool.h
index 2afcd75..47e9527 100644
--- a/ThreadPool/include/AsteriskSCF/ThreadPool.h
+++ b/ThreadPool/include/AsteriskSCF/ThreadPool.h
@@ -48,7 +48,7 @@ public:
  * For more information on these methods, see
  * AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
  */
-class ThreadPoolFactory : public AsteriskSCF::System::ThreadPool::V1::PoolFactory
+class ASTERISK_SCF_ICEBOX_EXPORT ThreadPoolFactory : public AsteriskSCF::System::ThreadPool::V1::PoolFactory
 {
 public:
     ThreadPoolFactory();
diff --git a/ThreadPool/src/CMakeLists.txt b/ThreadPool/src/CMakeLists.txt
index 7e82838..584d4d4 100644
--- a/ThreadPool/src/CMakeLists.txt
+++ b/ThreadPool/src/CMakeLists.txt
@@ -20,7 +20,7 @@ asterisk_scf_component_add_file(ThreadPool
     ../include/AsteriskSCF/WorkerThread.h)
 asterisk_scf_component_add_file(ThreadPool ThreadPool.cpp)
 asterisk_scf_component_add_file(ThreadPool WorkerThread.cpp)
-asterisk_scf_component_add_boost_libraries(ThreadPool thread)
+asterisk_scf_component_add_boost_libraries(ThreadPool thread date_time)
 
 asterisk_scf_component_build_library(ThreadPool)
 target_link_libraries(ThreadPool WorkQueue)
diff --git a/ThreadPool/test/ProofOfConcept.cpp b/ThreadPool/test/ProofOfConcept.cpp
index a19af82..78be2c1 100644
--- a/ThreadPool/test/ProofOfConcept.cpp
+++ b/ThreadPool/test/ProofOfConcept.cpp
@@ -168,7 +168,7 @@ BOOST_AUTO_TEST_CASE(simpleCase)
     //just be able to enqueue a piece of work to the queue
     //and have it automatically execute.
     threadWork->enqueueWork(task);
-    sleep(5);
+    std::sleep(5);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/WorkQueue/include/AsteriskSCF/DefaultQueueListener.h b/WorkQueue/include/AsteriskSCF/DefaultQueueListener.h
index a7fb39b..9cf9f9c 100644
--- a/WorkQueue/include/AsteriskSCF/DefaultQueueListener.h
+++ b/WorkQueue/include/AsteriskSCF/DefaultQueueListener.h
@@ -39,7 +39,8 @@ class DefaultQueueListenerPriv;
  * provided as part of the WorkQueue library
  * as a matter of convenience.
  */
-class DefaultQueueListener : public AsteriskSCF::System::WorkQueue::V1::QueueListener
+
+class ASTERISK_SCF_ICEBOX_EXPORT DefaultQueueListener : public AsteriskSCF::System::WorkQueue::V1::QueueListener
 {
 public:
     DefaultQueueListener(const AsteriskSCF::System::WorkQueue::V1::QueuePtr& queue);
diff --git a/WorkQueue/include/AsteriskSCF/SuspendableWorkQueue.h b/WorkQueue/include/AsteriskSCF/SuspendableWorkQueue.h
index 4b2387c..cb2b292 100644
--- a/WorkQueue/include/AsteriskSCF/SuspendableWorkQueue.h
+++ b/WorkQueue/include/AsteriskSCF/SuspendableWorkQueue.h
@@ -27,7 +27,7 @@ namespace WorkQueue
 
 class SuspendableWorkQueuePriv;
 
-class SuspendableWorkQueue : public AsteriskSCF::System::WorkQueue::V1::SuspendableQueue
+class ASTERISK_SCF_ICEBOX_EXPORT SuspendableWorkQueue : public AsteriskSCF::System::WorkQueue::V1::SuspendableQueue
 {
 public:
     SuspendableWorkQueue();
diff --git a/WorkQueue/include/AsteriskSCF/WorkQueue.h b/WorkQueue/include/AsteriskSCF/WorkQueue.h
index 2ebdeaf..5544c96 100644
--- a/WorkQueue/include/AsteriskSCF/WorkQueue.h
+++ b/WorkQueue/include/AsteriskSCF/WorkQueue.h
@@ -26,7 +26,7 @@ namespace WorkQueue
 
 class WorkQueuePriv;
 
-class WorkQueue : public AsteriskSCF::System::WorkQueue::V1::Queue
+class ASTERISK_SCF_ICEBOX_EXPORT WorkQueue : public AsteriskSCF::System::WorkQueue::V1::Queue
 {
 public:
     WorkQueue();
diff --git a/WorkQueue/src/CMakeLists.txt b/WorkQueue/src/CMakeLists.txt
index 1dfd843..31d8d88 100644
--- a/WorkQueue/src/CMakeLists.txt
+++ b/WorkQueue/src/CMakeLists.txt
@@ -22,9 +22,10 @@ asterisk_scf_component_add_file(WorkQueue
 asterisk_scf_component_add_file(WorkQueue WorkQueue.cpp)
 asterisk_scf_component_add_file(WorkQueue SuspendableWorkQueue.cpp)
 asterisk_scf_component_add_file(WorkQueue DefaultQueueListener.cpp)
-asterisk_scf_component_add_boost_libraries(WorkQueue thread)
+asterisk_scf_component_add_boost_libraries(WorkQueue thread date_time)
 
 asterisk_scf_component_build_library(WorkQueue)
 target_link_libraries(WorkQueue asterisk-scf-api)
 
 asterisk_scf_headers_install(../include/)
+asterisk_scf_component_install(WorkQueue)

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/ice-util-cpp.git



More information about the asterisk-scf-commits mailing list