|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r50928 - in branches/release: boost/statechart libs/statechart/doc libs/statechart/test
From: ahd6974-boostorg_at_[hidden]
Date: 2009-01-31 09:43:47
Author: andreas_huber69
Date: 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
New Revision: 50928
URL: http://svn.boost.org/trac/boost/changeset/50928
Log:
Merged various minor changes from trunk to branch.
Text files modified:
branches/release/boost/statechart/state_machine.hpp | 4 ++--
branches/release/libs/statechart/doc/acknowledgments.html | 4 ++--
branches/release/libs/statechart/doc/future_and_history.html | 6 ++++++
branches/release/libs/statechart/test/CustomReactionTest.vcproj | 4 ++--
branches/release/libs/statechart/test/DeferralTest.vcproj | 4 ++--
branches/release/libs/statechart/test/FifoSchedulerTest.cpp | 4 ++--
branches/release/libs/statechart/test/FifoSchedulerTest.vcproj | 4 ++--
branches/release/libs/statechart/test/HistoryTest.vcproj | 4 ++--
branches/release/libs/statechart/test/InStateReactionTest.vcproj | 4 ++--
branches/release/libs/statechart/test/InvalidResultCopyTest.vcproj | 4 ++--
branches/release/libs/statechart/test/StateCastTest.vcproj | 4 ++--
branches/release/libs/statechart/test/StateIterationTest.vcproj | 4 ++--
branches/release/libs/statechart/test/TerminationTest.vcproj | 4 ++--
branches/release/libs/statechart/test/TransitionTest.vcproj | 4 ++--
branches/release/libs/statechart/test/TuTest.vcproj | 4 ++--
branches/release/libs/statechart/test/TypeInfoTest.vcproj | 4 ++--
branches/release/libs/statechart/test/UnconsumedResultTest.vcproj | 4 ++--
17 files changed, 38 insertions(+), 32 deletions(-)
Modified: branches/release/boost/statechart/state_machine.hpp
==============================================================================
--- branches/release/boost/statechart/state_machine.hpp (original)
+++ branches/release/boost/statechart/state_machine.hpp 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -549,9 +549,9 @@
add_impl( pState, *pState );
if ( isInnermostCommonOuter_ ||
- is_in_highest_orthogonal_region< State >() &&
+ ( is_in_highest_orthogonal_region< State >() &&
( get_pointer( pOutermostUnstableState_ ) ==
- pState->State::outer_state_ptr() ) )
+ pState->State::outer_state_ptr() ) ) )
{
isInnermostCommonOuter_ = false;
pOutermostUnstableState_ = pNewOutermostUnstableStateCandidate;
Modified: branches/release/libs/statechart/doc/acknowledgments.html
==============================================================================
--- branches/release/libs/statechart/doc/acknowledgments.html (original)
+++ branches/release/libs/statechart/doc/acknowledgments.html 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -90,8 +90,8 @@
Gurtovoy, Federico J. Fernández, Iain K. Hanson, David B. Held,
Jürgen Hunold, Sean Kelly, Oliver Kowalke, Simon Meiklejohn, Jiang
Miao, Johan Nilsson, Matthieu Paindavoine, Chris Paulse, Yuval Ronen, Chris
- Russell, Rob Stewart, Kwee Heong Tan, Marcin Tustin, Vincent N. Virgilio,
- Gang Wang, Steven Watanabe and Scott Woods.</p>
+ Russell, Bryan Silverthorn, Rob Stewart, Kwee Heong Tan, Marcin Tustin,
+ Vincent N. Virgilio, Gang Wang, Steven Watanabe and Scott Woods.</p>
<hr>
<p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
Modified: branches/release/libs/statechart/doc/future_and_history.html
==============================================================================
--- branches/release/libs/statechart/doc/future_and_history.html (original)
+++ branches/release/libs/statechart/doc/future_and_history.html 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -140,6 +140,12 @@
<p>(<font color="#FF0000">red</font> = points raised during formal
review)</p>
+ <p>1.38.0</p>
+ <ul>
+ <li>Fixed gcc-4.3 warning in state_machine.hpp (ticket #2389), reported by
+ Bryan Silverthorn</li>
+ </ul>
+
<p>1.36.0</p>
<ul>
<li>Removed all permanent warning suppressions from library headers
Modified: branches/release/libs/statechart/test/CustomReactionTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/CustomReactionTest.vcproj (original)
+++ branches/release/libs/statechart/test/CustomReactionTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/CustomReactionTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/CustomReactionTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/DeferralTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/DeferralTest.vcproj (original)
+++ branches/release/libs/statechart/test/DeferralTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/DeferralTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/DeferralTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/FifoSchedulerTest.cpp
==============================================================================
--- branches/release/libs/statechart/test/FifoSchedulerTest.cpp (original)
+++ branches/release/libs/statechart/test/FifoSchedulerTest.cpp 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -6,6 +6,8 @@
+#include <boost/test/test_tools.hpp>
+
#include <boost/statechart/asynchronous_state_machine.hpp>
#include <boost/statechart/fifo_scheduler.hpp>
#include <boost/statechart/event.hpp>
@@ -18,8 +20,6 @@
#include <boost/bind.hpp>
#include <boost/ref.hpp>
-#include <boost/test/test_tools.hpp>
-
#include <stdexcept>
Modified: branches/release/libs/statechart/test/FifoSchedulerTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/FifoSchedulerTest.vcproj (original)
+++ branches/release/libs/statechart/test/FifoSchedulerTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/FifoSchedulerTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/FifoSchedulerTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/HistoryTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/HistoryTest.vcproj (original)
+++ branches/release/libs/statechart/test/HistoryTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/HistoryTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/HistoryTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/InStateReactionTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/InStateReactionTest.vcproj (original)
+++ branches/release/libs/statechart/test/InStateReactionTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/InStateReactionTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/InStateReactionTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/InvalidResultCopyTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/InvalidResultCopyTest.vcproj (original)
+++ branches/release/libs/statechart/test/InvalidResultCopyTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/InvalidResultCopyTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/InvalidResultCopyTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/StateCastTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/StateCastTest.vcproj (original)
+++ branches/release/libs/statechart/test/StateCastTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/StateCastTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/StateCastTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/StateIterationTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/StateIterationTest.vcproj (original)
+++ branches/release/libs/statechart/test/StateIterationTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/StateIterationTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/StateIterationTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/TerminationTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/TerminationTest.vcproj (original)
+++ branches/release/libs/statechart/test/TerminationTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/TerminationTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/TerminationTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/TransitionTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/TransitionTest.vcproj (original)
+++ branches/release/libs/statechart/test/TransitionTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/TransitionTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/TransitionTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/TuTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/TuTest.vcproj (original)
+++ branches/release/libs/statechart/test/TuTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/TuTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/TuTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/TypeInfoTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/TypeInfoTest.vcproj (original)
+++ branches/release/libs/statechart/test/TypeInfoTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/TypeInfoTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/TypeInfoTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/UnconsumedResultTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/UnconsumedResultTest.vcproj (original)
+++ branches/release/libs/statechart/test/UnconsumedResultTest.vcproj 2009-01-31 09:43:46 EST (Sat, 31 Jan 2009)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_38.lib"
OutputFile="$(OutDir)/UnconsumedResultTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_38.lib"
OutputFile="$(OutDir)/UnconsumedResultTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk