diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index 0de6606241..596855c2e6 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -28,12 +28,6 @@
true
true
-
- true
- true
- true
- true
-
true
@@ -1500,7 +1494,6 @@
-
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index e1c29bc6e6..805968654c 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -984,9 +984,6 @@
[2] Old Ripple\ripple_app\main
-
- [1] Ripple\frame\api
-
@@ -1947,9 +1944,6 @@
[2] Old Ripple\ripple_app\main
-
- [1] Ripple\frame\api
-
diff --git a/src/beast/Builds/VisualStudio2012/beast.vcxproj b/src/beast/Builds/VisualStudio2012/beast.vcxproj
index b6934c6da5..6f9e5f3c3c 100644
--- a/src/beast/Builds/VisualStudio2012/beast.vcxproj
+++ b/src/beast/Builds/VisualStudio2012/beast.vcxproj
@@ -307,6 +307,7 @@
+
@@ -1138,6 +1139,12 @@
true
true
+
+ true
+ true
+ true
+ true
+
true
true
diff --git a/src/beast/Builds/VisualStudio2012/beast.vcxproj.filters b/src/beast/Builds/VisualStudio2012/beast.vcxproj.filters
index aad5b086e5..b725af4e99 100644
--- a/src/beast/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/src/beast/Builds/VisualStudio2012/beast.vcxproj.filters
@@ -1101,6 +1101,9 @@
beast\mpl
+
+ beast_core\thread
+
@@ -1631,6 +1634,9 @@
beast_asio\http
+
+ beast_core\thread
+
diff --git a/src/beast/modules/beast_core/beast_core.cpp b/src/beast/modules/beast_core/beast_core.cpp
index f585d9ac36..7658f795ea 100644
--- a/src/beast/modules/beast_core/beast_core.cpp
+++ b/src/beast/modules/beast_core/beast_core.cpp
@@ -206,6 +206,7 @@ namespace beast
#include "thread/impl/TrackedMutex.cpp"
#include "thread/DeadlineTimer.cpp"
#include "thread/InterruptibleThread.cpp"
+#include "thread/Stoppable.cpp"
#include "thread/Semaphore.cpp"
#include "thread/CallQueue.cpp"
#include "thread/Listeners.cpp"
diff --git a/src/beast/modules/beast_core/beast_core.h b/src/beast/modules/beast_core/beast_core.h
index d403109c59..b0fedbe090 100644
--- a/src/beast/modules/beast_core/beast_core.h
+++ b/src/beast/modules/beast_core/beast_core.h
@@ -90,6 +90,7 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
#include "../../beast/Net.h"
#include "../../beast/TypeTraits.h"
#include "../../beast/Thread.h"
+#include "../../beast/Utility.h"
namespace beast {
@@ -269,6 +270,7 @@ class FileOutputStream;
#include "thread/Semaphore.h"
#include "thread/InterruptibleThread.h"
+#include "thread/Stoppable.h"
#include "thread/CallQueue.h"
#include "thread/Listeners.h"
#include "thread/ManualCallQueue.h"
diff --git a/src/ripple/frame/api/Stoppable.cpp b/src/beast/modules/beast_core/thread/Stoppable.cpp
similarity index 99%
rename from src/ripple/frame/api/Stoppable.cpp
rename to src/beast/modules/beast_core/thread/Stoppable.cpp
index e6be6d4c94..bd6febd4fa 100644
--- a/src/ripple/frame/api/Stoppable.cpp
+++ b/src/beast/modules/beast_core/thread/Stoppable.cpp
@@ -4,9 +4,6 @@
*/
//==============================================================================
-namespace ripple
-{
-
Stoppable::Stoppable (char const* name, Stoppable& parent)
: m_name (name)
, m_root (false)
@@ -165,5 +162,3 @@ void Stoppable::stopRecursive (Journal::Stream stream)
// once we get here, we know the stoppable has stopped.
m_stopped = true;
}
-
-}
diff --git a/src/ripple/frame/api/Stoppable.h b/src/beast/modules/beast_core/thread/Stoppable.h
similarity index 90%
rename from src/ripple/frame/api/Stoppable.h
rename to src/beast/modules/beast_core/thread/Stoppable.h
index dac6e1e85e..5aa2cb1f78 100644
--- a/src/ripple/frame/api/Stoppable.h
+++ b/src/beast/modules/beast_core/thread/Stoppable.h
@@ -1,18 +1,24 @@
//------------------------------------------------------------------------------
/*
- Copyright (c) 2011-2013, OpenCoin, Inc.
+ This file is part of Beast: https://github.com/vinniefalco/Beast
+ Copyright 2013, Vinnie Falco
+
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
-#ifndef RIPPLE_FRAME_STOPPABLE_H_INCLUDED
-#define RIPPLE_FRAME_STOPPABLE_H_INCLUDED
-
-#include "../../../beast/beast/utility/Journal.h"
-
-namespace ripple
-{
-
-using namespace beast;
+#ifndef BEAST_CORE_STOPPABLE_H_INCLUDED
+#define BEAST_CORE_STOPPABLE_H_INCLUDED
/** Provides an interface for stopping.
@@ -255,6 +261,4 @@ private:
WaitableEvent m_stoppedEvent;
};
-}
-
#endif
diff --git a/src/ripple/frame/ripple_frame.cpp b/src/ripple/frame/ripple_frame.cpp
index 8e362e5b4e..d38b202efb 100644
--- a/src/ripple/frame/ripple_frame.cpp
+++ b/src/ripple/frame/ripple_frame.cpp
@@ -14,4 +14,3 @@
#include "ripple_frame.h"
#include "api/RPCService.cpp"
-#include "api/Stoppable.cpp"
diff --git a/src/ripple/frame/ripple_frame.h b/src/ripple/frame/ripple_frame.h
index c1dcd00522..772efee51e 100644
--- a/src/ripple/frame/ripple_frame.h
+++ b/src/ripple/frame/ripple_frame.h
@@ -11,7 +11,6 @@
#include "../json/ripple_json.h"
-#include "api/Stoppable.h"
#include "api/RPCService.h"
#endif