[asterisk-scf-commits] asterisk-scf/release/util-cpp.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  b30186c143e74a53ee0408f2a0220981adcada82 (commit)
       via  cd4df83103a7f3a80499099343a424c854033b47 (commit)
       via  727e3b6512259c41a5d054d82afe475d388b78d7 (commit)
      from  8f69dc4c01a2fe68b8a6e32a7da9b5b6cc42fec2 (commit)

Summary of changes:
 .../AsteriskSCF/StateMachine/SimpleStateMachine.h  |   12 ++++++++++++
 StateMachine/test/CMakeLists.txt                   |    6 ++++--
 Threading/test/CMakeLists.txt                      |    4 +++-
 3 files changed, 19 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit b30186c143e74a53ee0408f2a0220981adcada82
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Fri May 6 10:29:45 2011 -0500

    Build system updates.

diff --git a/StateMachine/test/CMakeLists.txt b/StateMachine/test/CMakeLists.txt
index a100e2c..f0d3884 100644
--- a/StateMachine/test/CMakeLists.txt
+++ b/StateMachine/test/CMakeLists.txt
@@ -11,4 +11,6 @@ include_directories(${util_cpp_dir}/StateMachine/include)
 
 asterisk_scf_component_build_standalone(StateMachineTest)
 
-boost_add_test(StateMachineTest)
+if(integrated_build STREQUAL "true")
+    asterisk_scf_test_boost(StateMachineTest)
+endif()
diff --git a/Threading/test/CMakeLists.txt b/Threading/test/CMakeLists.txt
index a20d74d..79825f2 100644
--- a/Threading/test/CMakeLists.txt
+++ b/Threading/test/CMakeLists.txt
@@ -19,4 +19,6 @@ target_link_libraries(SimpleWorkQueueTest logging-client)
 
 target_link_libraries(SimpleWorkQueueTest Threading)
 
-boost_add_test(SimpleWorkQueueTest)
+if(integrated_build STREQUAL "true")
+    asterisk_scf_test_boost(SimpleWorkQueueTest)
+endif()

commit cd4df83103a7f3a80499099343a424c854033b47
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed May 4 12:31:00 2011 -0500

    Added resetStartState method.

diff --git a/StateMachine/include/AsteriskSCF/StateMachine/SimpleStateMachine.h b/StateMachine/include/AsteriskSCF/StateMachine/SimpleStateMachine.h
index dc6d248..9575be0 100644
--- a/StateMachine/include/AsteriskSCF/StateMachine/SimpleStateMachine.h
+++ b/StateMachine/include/AsteriskSCF/StateMachine/SimpleStateMachine.h
@@ -120,6 +120,7 @@ public:
 
     /** 
      * Sets the next state. State transitions occur after the current state's execution is complete. 
+     * This operation is typicall called by the state machine's state handlers. 
      */
     void setNextState(S state)
     {
@@ -182,6 +183,17 @@ public:
         }
     }
 
+    /**
+     * This is used to set the start state. This should only be used if the
+     * start state passed into the constuctor should be reset 
+     * prior to executing the state machine.
+     *  @see setNextState
+     */
+    void resetStartState(S state)
+    {
+        mCurrentState = state;
+    }
+
 private: 
 
     /**

commit 727e3b6512259c41a5d054d82afe475d388b78d7
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Mon Apr 25 14:43:40 2011 -0500

    More cleanup.

diff --git a/StateMachine/test/CMakeLists.txt b/StateMachine/test/CMakeLists.txt
index 3013313..a100e2c 100644
--- a/StateMachine/test/CMakeLists.txt
+++ b/StateMachine/test/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(../include)
 
 asterisk_scf_component_add_file(StateMachineTest  StateMachineTest.cpp)
 
-asterisk_scf_component_add_boost_libraries(StateMachineTest unit_test_framework date_time)
+asterisk_scf_component_add_boost_libraries(StateMachineTest unit_test_framework thread date_time)
 
 include_directories(${util_cpp_dir}/StateMachine/include)
 

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


-- 
asterisk-scf/release/util-cpp.git