Merge beast_basics to beast_core

This commit is contained in:
Vinnie Falco
2013-08-24 09:02:58 -07:00
parent 9ba8ea679c
commit 2bea9a8739
57 changed files with 609 additions and 663 deletions

View File

@@ -15,7 +15,7 @@
#include "BeastConfig.h"
// This must come first to work around the boost placeholders issues
#include "beast/modules/beast_basics/beast_basics.h"
#include "beast/modules/beast_core/beast_core.h"
#if BEAST_LINUX || BEAST_MAC || BEAST_BSD
#include <sys/resource.h>
@@ -50,7 +50,6 @@
#include <boost/regex.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/smart_ptr/shared_ptr.hpp>
//#include <boost/thread.hpp>
#include <boost/thread/condition_variable.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/recursive_mutex.hpp>