forked from boostorg/beast
Add IPEndpoint
Conflicts: src/beast/Builds/VisualStudio2012/beast.vcxproj.filters
This commit is contained in:
1 parent
14b34fc6ef
commit
874b5240d2
7 files changed
+776
-5
No files matched your search
@@ -224,11 +224,6 @@ Some files contain portions of these external projects, licensed separately:
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
// New header-only library modeled more closely according to boost
|
||||
#include "../../beast/intrusive/ForwardList.h"
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace beast
|
||||
{
|
||||
|
||||
@@ -251,6 +246,19 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
|
||||
#include "memory/Atomic.h"
|
||||
#include "text/CharacterFunctions.h"
|
||||
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
// New header-only library modeled more closely according to boost
|
||||
#include "../../beast/intrusive/ForwardList.h"
|
||||
#include "../../beast/net.h"
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace beast
|
||||
{
|
||||
|
||||
#if BEAST_MSVC
|
||||
# pragma warning (push)
|
||||
# pragma warning (disable: 4514 4996)
|
||||
|
||||
Reference in new issue
Block a user