mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-27 22:45:52 +00:00
Rename SharedSingleton and move files around
This commit is contained in:
Vinnie Falco
@@ -68,7 +68,6 @@
|
||||
<ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_CatchAny.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\events\beast_OncePerSecond.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\functor\beast_Function.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\math\beast_Interval.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\math\beast_Math.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\math\beast_MurmurHash.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\memory\beast_AllocatedBy.h" />
|
||||
@@ -78,7 +77,6 @@
|
||||
<ClInclude Include="..\..\modules\beast_basics\memory\beast_GlobalFifoFreeStore.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\memory\beast_GlobalPagedFreeStore.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\memory\beast_PagedFreeStore.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\memory\beast_RefCountedSingleton.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\threads\beast_CallQueue.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\threads\beast_ConcurrentObject.h" />
|
||||
<ClInclude Include="..\..\modules\beast_basics\threads\beast_ConcurrentState.h" />
|
||||
@@ -126,12 +124,12 @@
|
||||
<ClInclude Include="..\..\modules\beast_core\files\beast_FileSearchPath.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\files\beast_MemoryMappedFile.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\files\beast_TemporaryFile.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\functional\beast_Bind.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\json\beast_JSON.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\logging\beast_FileLogger.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\logging\beast_Logger.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\maths\beast_BigInteger.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\maths\beast_Expression.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\maths\beast_Interval.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\maths\beast_MathsFunctions.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\maths\beast_Random.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\maths\beast_Range.h" />
|
||||
@@ -149,6 +147,7 @@
|
||||
<ClInclude Include="..\..\modules\beast_core\memory\beast_OptionalScopedPointer.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\memory\beast_ReferenceCountedObject.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\memory\beast_ScopedPointer.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\memory\beast_SharedSingleton.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\memory\beast_Singleton.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\memory\beast_StaticObject.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\memory\beast_Uncopyable.h" />
|
||||
@@ -174,6 +173,7 @@
|
||||
<ClInclude Include="..\..\modules\beast_core\streams\beast_MemoryOutputStream.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\streams\beast_OutputStream.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\streams\beast_SubregionStream.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\system\beast_Functional.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\system\beast_PlatformDefs.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\system\beast_StandardHeader.h" />
|
||||
<ClInclude Include="..\..\modules\beast_core\system\beast_SystemStats.h" />
|
||||
@@ -274,18 +274,6 @@
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_basics\native\beast_posix_FPUFlags.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_basics\native\beast_win32_FPUFlags.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_basics\threads\beast_CallQueue.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
@@ -569,6 +557,12 @@
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_core\native\beast_posix_FPUFlags.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_core\native\beast_posix_NamedPipe.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
@@ -581,6 +575,12 @@
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_core\native\beast_win32_FPUFlags.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_core\native\beast_win32_Network.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
@@ -894,6 +894,9 @@
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\..\TODO.txt" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
|
||||
@@ -110,15 +110,9 @@
|
||||
<Filter Include="beast_basics\memory">
|
||||
<UniqueIdentifier>{9e850052-6ab7-4a65-911d-adfde81ceb5f}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="beast_basics\native">
|
||||
<UniqueIdentifier>{811c5374-8959-4df9-aba9-a7e27b85046e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="beast_basics\threads">
|
||||
<UniqueIdentifier>{f58dddf7-fe43-49a2-8e57-91feba586119}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="beast_core\functional">
|
||||
<UniqueIdentifier>{b70d6403-2d7a-4377-81ff-390830ab0276}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="beast_core\diagnostic">
|
||||
<UniqueIdentifier>{69e28551-92ea-420b-a465-75ed248e3b59}</UniqueIdentifier>
|
||||
</Filter>
|
||||
@@ -482,9 +476,6 @@
|
||||
<ClInclude Include="..\..\modules\beast_basics\functor\beast_Function.h">
|
||||
<Filter>beast_basics\functor</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\modules\beast_basics\math\beast_Interval.h">
|
||||
<Filter>beast_basics\math</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\modules\beast_basics\math\beast_Math.h">
|
||||
<Filter>beast_basics\math</Filter>
|
||||
</ClInclude>
|
||||
@@ -512,9 +503,6 @@
|
||||
<ClInclude Include="..\..\modules\beast_basics\memory\beast_PagedFreeStore.h">
|
||||
<Filter>beast_basics\memory</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\modules\beast_basics\memory\beast_RefCountedSingleton.h">
|
||||
<Filter>beast_basics\memory</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\modules\beast_basics\threads\beast_CallQueue.h">
|
||||
<Filter>beast_basics\threads</Filter>
|
||||
</ClInclude>
|
||||
@@ -557,9 +545,6 @@
|
||||
<ClInclude Include="..\..\modules\beast_core\containers\beast_List.h">
|
||||
<Filter>beast_core\containers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\modules\beast_core\functional\beast_Bind.h">
|
||||
<Filter>beast_core\functional</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\modules\beast_core\memory\beast_CacheLine.h">
|
||||
<Filter>beast_core\memory</Filter>
|
||||
</ClInclude>
|
||||
@@ -617,6 +602,15 @@
|
||||
<ClInclude Include="..\..\modules\beast_core\memory\beast_Uncopyable.h">
|
||||
<Filter>beast_core\memory</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\modules\beast_core\memory\beast_SharedSingleton.h">
|
||||
<Filter>beast_core\memory</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\modules\beast_core\system\beast_Functional.h">
|
||||
<Filter>beast_core\system</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\modules\beast_core\maths\beast_Interval.h">
|
||||
<Filter>beast_core\maths</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
|
||||
@@ -892,12 +886,6 @@
|
||||
<ClCompile Include="..\..\modules\beast_basics\memory\beast_PagedFreeStore.cpp">
|
||||
<Filter>beast_basics\memory</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_basics\native\beast_posix_FPUFlags.cpp">
|
||||
<Filter>beast_basics\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_basics\native\beast_win32_FPUFlags.cpp">
|
||||
<Filter>beast_basics\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_basics\threads\beast_CallQueue.cpp">
|
||||
<Filter>beast_basics\threads</Filter>
|
||||
</ClCompile>
|
||||
@@ -955,5 +943,14 @@
|
||||
<ClCompile Include="..\..\modules\beast_core\threads\beast_SpinDelay.cpp">
|
||||
<Filter>beast_core\threads</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_core\native\beast_posix_FPUFlags.cpp">
|
||||
<Filter>beast_core\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\modules\beast_core\native\beast_win32_FPUFlags.cpp">
|
||||
<Filter>beast_core\native</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\..\TODO.txt" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
50
TODO.txt
Normal file
50
TODO.txt
Normal file
@@ -0,0 +1,50 @@
|
||||
--------------------------------------------------------------------------------
|
||||
BEAST TODO
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
- Tidy up CacheLine, MemoryAlignment
|
||||
|
||||
- Kill off beast_Singleton.h since it uses macros
|
||||
|
||||
- Remove anything having to do with DLL builds like
|
||||
BEAST_DLL, BEAST_DLL_BUILD, BEAST_DISABLE_DLL_ALLOCATORS
|
||||
|
||||
- Fix FifoFreeStoreWithTLS reference counting bug
|
||||
|
||||
- Implement a reasonable substitute for boost's thread_local_storage
|
||||
|
||||
- Think about doing away with BEAST_CALLTYPE and BEAST_API
|
||||
|
||||
- Decide if headers should just include BeastConfig.h instead of making the
|
||||
host program do it.
|
||||
|
||||
- Rename malloc/calloc JUCE members that conflict with the debug CRT from MSVC
|
||||
|
||||
- Make beast::HashMap support assignment via operator[]
|
||||
|
||||
- Reformat every Doxygen comment
|
||||
- Fix Doxygen metatags
|
||||
- update Beast Doxyfile
|
||||
|
||||
- Rename include guards to boost style, e.g. BEAST_THROW_H_INCLUDED
|
||||
|
||||
- Decide if we should get rid of AtomicCounter, AtomicFlag, AtomicPointer, AtomicState
|
||||
|
||||
- Clean up CacheLine, StaticObject
|
||||
|
||||
- Clean up ConcurrentObject
|
||||
|
||||
- Rename ConcurrentState to SharedState or something?
|
||||
|
||||
- Figure out what to do with ReadWriteLock, and NamedPipe which uses it?
|
||||
|
||||
- Put BEAST_PUBLIC_FUNCTION in front of all loose functions
|
||||
|
||||
- restructure the repo sources to look like this:
|
||||
/Source/beast/beast_core/beast_core.h
|
||||
etc...
|
||||
- Put the BeastConfig.h at the root of the repo.
|
||||
- Make sure the template BeastConfig.h is included in the Doxyfile
|
||||
|
||||
- Implement robust key/value database with bulk write
|
||||
|
||||
@@ -62,13 +62,6 @@ namespace beast
|
||||
#include "threads/beast_ThreadGroup.cpp"
|
||||
#include "threads/beast_ThreadWithCallQueue.cpp"
|
||||
|
||||
#if BEAST_WINDOWS
|
||||
#include "native/beast_win32_FPUFlags.cpp"
|
||||
|
||||
#else
|
||||
#include "native/beast_posix_FPUFlags.cpp"
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
#if BEAST_MSVC
|
||||
|
||||
@@ -248,11 +248,9 @@ namespace beast
|
||||
#include "functor/beast_Function.h"
|
||||
#include "diagnostic/beast_CatchAny.h"
|
||||
#include "events/beast_OncePerSecond.h"
|
||||
#include "math/beast_Interval.h"
|
||||
#include "math/beast_Math.h"
|
||||
#include "math/beast_MurmurHash.h"
|
||||
#include "memory/beast_AllocatedBy.h"
|
||||
#include "memory/beast_RefCountedSingleton.h"
|
||||
#include "memory/beast_PagedFreeStore.h"
|
||||
#include "memory/beast_GlobalPagedFreeStore.h"
|
||||
#include "memory/beast_FifoFreeStoreWithTLS.h"
|
||||
|
||||
@@ -18,12 +18,12 @@
|
||||
//==============================================================================
|
||||
|
||||
class OncePerSecond::TimerSingleton
|
||||
: public RefCountedSingleton <OncePerSecond::TimerSingleton>
|
||||
: public SharedSingleton <OncePerSecond::TimerSingleton>
|
||||
, private InterruptibleThread::EntryPoint
|
||||
{
|
||||
private:
|
||||
TimerSingleton ()
|
||||
: RefCountedSingleton <OncePerSecond::TimerSingleton> (
|
||||
: SharedSingleton <OncePerSecond::TimerSingleton> (
|
||||
SingletonLifetime::persistAfterCreation)
|
||||
, m_thread ("Once Per Second")
|
||||
{
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
// Original source code links in .cpp file
|
||||
|
||||
// This file depends on some Juce declarations and defines
|
||||
// This file depends on some Beast declarations and defines
|
||||
|
||||
namespace Murmur
|
||||
{
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
@ingroup beast_concurrent
|
||||
*/
|
||||
template <class Tag>
|
||||
class GlobalFifoFreeStore : public RefCountedSingleton <GlobalFifoFreeStore <Tag> >
|
||||
class GlobalFifoFreeStore : public SharedSingleton <GlobalFifoFreeStore <Tag> >
|
||||
{
|
||||
public:
|
||||
inline void* allocate (size_t bytes)
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
|
||||
private:
|
||||
GlobalFifoFreeStore ()
|
||||
: RefCountedSingleton <GlobalFifoFreeStore <Tag> >
|
||||
: SharedSingleton <GlobalFifoFreeStore <Tag> >
|
||||
(SingletonLifetime::persistAfterCreation)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ static const size_t globalPageBytes = 8 * 1024;
|
||||
}
|
||||
|
||||
GlobalPagedFreeStore::GlobalPagedFreeStore ()
|
||||
: RefCountedSingleton <GlobalPagedFreeStore> (SingletonLifetime::persistAfterCreation)
|
||||
: SharedSingleton <GlobalPagedFreeStore> (SingletonLifetime::persistAfterCreation)
|
||||
, m_allocator (globalPageBytes)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
@ingroup beast_concurrent
|
||||
*/
|
||||
class BEAST_API GlobalPagedFreeStore
|
||||
: public RefCountedSingleton <GlobalPagedFreeStore>
|
||||
: public SharedSingleton <GlobalPagedFreeStore>
|
||||
, LeakChecked <GlobalPagedFreeStore>
|
||||
{
|
||||
private:
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
@ingroup beast_concurrent
|
||||
*/
|
||||
class BEAST_API GlobalThreadGroup : public ThreadGroup,
|
||||
public RefCountedSingleton <GlobalThreadGroup>
|
||||
public SharedSingleton <GlobalThreadGroup>
|
||||
{
|
||||
private:
|
||||
friend class RefCountedSingleton <GlobalThreadGroup>;
|
||||
friend class SharedSingleton <GlobalThreadGroup>;
|
||||
|
||||
GlobalThreadGroup ()
|
||||
: RefCountedSingleton <GlobalThreadGroup> (
|
||||
: SharedSingleton <GlobalThreadGroup> (
|
||||
SingletonLifetime::persistAfterCreation)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -221,6 +221,12 @@ namespace beast
|
||||
#include "native/beast_osx_ObjCHelpers.h"
|
||||
#endif
|
||||
|
||||
#if BEAST_WINDOWS
|
||||
#include "native/beast_win32_FPUFlags.cpp"
|
||||
#else
|
||||
#include "native/beast_posix_FPUFlags.cpp"
|
||||
#endif
|
||||
|
||||
#if BEAST_ANDROID
|
||||
#include "native/beast_android_JNIHelpers.h"
|
||||
#endif
|
||||
|
||||
@@ -209,13 +209,10 @@ namespace beast
|
||||
#include "threads/beast_SpinDelay.h"
|
||||
#include "memory/beast_StaticObject.h"
|
||||
#include "diagnostic/beast_LeakChecked.h"
|
||||
|
||||
#include "memory/beast_Memory.h"
|
||||
#include "memory/beast_ByteOrder.h"
|
||||
#include "logging/beast_Logger.h"
|
||||
|
||||
#include "threads/beast_Thread.h"
|
||||
|
||||
#include "diagnostic/beast_Debug.h"
|
||||
#include "diagnostic/beast_SafeBool.h"
|
||||
#include "diagnostic/beast_Error.h"
|
||||
@@ -247,12 +244,12 @@ namespace beast
|
||||
#include "files/beast_FileSearchPath.h"
|
||||
#include "files/beast_MemoryMappedFile.h"
|
||||
#include "files/beast_TemporaryFile.h"
|
||||
#include "functional/beast_Bind.h"
|
||||
#include "json/beast_JSON.h"
|
||||
#include "logging/beast_FileLogger.h"
|
||||
#include "logging/beast_Logger.h"
|
||||
#include "maths/beast_BigInteger.h"
|
||||
#include "maths/beast_Expression.h"
|
||||
#include "maths/beast_Interval.h"
|
||||
#include "maths/beast_MathsFunctions.h"
|
||||
#include "maths/beast_Random.h"
|
||||
#include "maths/beast_Range.h"
|
||||
@@ -263,6 +260,9 @@ namespace beast
|
||||
#include "memory/beast_OptionalScopedPointer.h"
|
||||
#include "memory/beast_ReferenceCountedObject.h"
|
||||
#include "memory/beast_ScopedPointer.h"
|
||||
#include "threads/beast_SpinLock.h"
|
||||
#include "time/beast_PerformedAtExit.h"
|
||||
#include "memory/beast_SharedSingleton.h"
|
||||
#include "memory/beast_Singleton.h"
|
||||
#include "memory/beast_WeakReference.h"
|
||||
#include "memory/beast_MemoryAlignment.h"
|
||||
@@ -283,6 +283,7 @@ namespace beast
|
||||
#include "streams/beast_MemoryOutputStream.h"
|
||||
#include "streams/beast_OutputStream.h"
|
||||
#include "streams/beast_SubregionStream.h"
|
||||
#include "system/beast_Functional.h"
|
||||
#include "system/beast_PlatformDefs.h"
|
||||
#include "system/beast_StandardHeader.h"
|
||||
#include "system/beast_SystemStats.h"
|
||||
@@ -310,13 +311,11 @@ namespace beast
|
||||
#include "threads/beast_ScopedLock.h"
|
||||
#include "threads/beast_ScopedReadLock.h"
|
||||
#include "threads/beast_ScopedWriteLock.h"
|
||||
#include "threads/beast_SpinLock.h"
|
||||
#include "threads/beast_ThreadLocalValue.h"
|
||||
#include "threads/beast_ThreadPool.h"
|
||||
#include "threads/beast_TimeSliceThread.h"
|
||||
#include "threads/beast_WaitableEvent.h"
|
||||
#include "time/beast_PerformanceCounter.h"
|
||||
#include "time/beast_PerformedAtExit.h"
|
||||
#include "time/beast_RelativeTime.h"
|
||||
#include "time/beast_Time.h"
|
||||
#include "unit_tests/beast_UnitTest.h"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
//==============================================================================
|
||||
|
||||
void FPUFlags::clearUnsetFlagsFrom (const FPUFlags& flags)
|
||||
void FPUFlags::clearUnsetFlagsFrom (FPUFlags const& flags)
|
||||
{
|
||||
if (!flags.getMaskNaNs ().is_set ()) m_maskNaNs.clear ();
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
class Object must provide the function `Object* Object::createInstance()`
|
||||
|
||||
@class RefCountedSingleton
|
||||
@class SharedSingleton
|
||||
@ingroup beast_core
|
||||
*/
|
||||
/** @{ */
|
||||
@@ -42,7 +42,7 @@ public:
|
||||
// - ville
|
||||
//
|
||||
|
||||
/** Construction options for RefCountedSingleton
|
||||
/** Construction options for SharedSingleton
|
||||
|
||||
@ingroup beast_core
|
||||
*/
|
||||
@@ -66,7 +66,7 @@ public:
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
template <class Object>
|
||||
class RefCountedSingleton
|
||||
class SharedSingleton
|
||||
: public SingletonLifetime
|
||||
, private PerformedAtExit
|
||||
{
|
||||
@@ -77,7 +77,7 @@ protected:
|
||||
|
||||
@param lifetime The lifetime management option.
|
||||
*/
|
||||
explicit RefCountedSingleton (Lifetime const lifetime)
|
||||
explicit SharedSingleton (Lifetime const lifetime)
|
||||
: m_lifetime (lifetime)
|
||||
{
|
||||
bassert (s_instance == nullptr);
|
||||
@@ -94,7 +94,7 @@ protected:
|
||||
*s_created = true;
|
||||
}
|
||||
|
||||
virtual ~RefCountedSingleton ()
|
||||
virtual ~SharedSingleton ()
|
||||
{
|
||||
bassert (s_instance == nullptr);
|
||||
}
|
||||
@@ -181,20 +181,20 @@ private:
|
||||
|
||||
private:
|
||||
static Object* s_instance;
|
||||
static Static::Storage <LockType, RefCountedSingleton <Object> > s_mutex;
|
||||
static Static::Storage <bool, RefCountedSingleton <Object> > s_created;
|
||||
static Static::Storage <LockType, SharedSingleton <Object> > s_mutex;
|
||||
static Static::Storage <bool, SharedSingleton <Object> > s_created;
|
||||
};
|
||||
/** @{ */
|
||||
|
||||
template <class Object>
|
||||
Object* RefCountedSingleton <Object>::s_instance;
|
||||
Object* SharedSingleton <Object>::s_instance;
|
||||
|
||||
template <class Object>
|
||||
Static::Storage <typename RefCountedSingleton <Object>::LockType, RefCountedSingleton <Object> >
|
||||
RefCountedSingleton <Object>::s_mutex;
|
||||
Static::Storage <typename SharedSingleton <Object>::LockType, SharedSingleton <Object> >
|
||||
SharedSingleton <Object>::s_mutex;
|
||||
|
||||
template <class Object>
|
||||
Static::Storage <bool, RefCountedSingleton <Object> >
|
||||
RefCountedSingleton <Object>::s_created;
|
||||
Static::Storage <bool, SharedSingleton <Object> >
|
||||
SharedSingleton <Object>::s_created;
|
||||
|
||||
#endif
|
||||
@@ -65,7 +65,6 @@ bool Process::openEmailWithAttachments (const String& /* targetEmailAddress */,
|
||||
class WebInputStream
|
||||
: public InputStream
|
||||
, LeakChecked <WebInputStream>
|
||||
, Uncopyable
|
||||
{
|
||||
public:
|
||||
WebInputStream (const String& address_, bool isPost_, const MemoryBlock& postData_,
|
||||
|
||||
@@ -324,7 +324,7 @@ using boost::placeholders::_20;
|
||||
|
||||
#else
|
||||
|
||||
#error Unknown bind source in beast_Bind.h
|
||||
#error Unknown bind source in beast_Functional.h
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user