Commit c2825e86 authored by Davis King's avatar Davis King

Moved function definitions into cpp files and also updated the server_http's

spec appropriately.
parent 5e7303a3
...@@ -38,6 +38,9 @@ ...@@ -38,6 +38,9 @@
#include "../sockets/sockets_kernel_2.cpp" #include "../sockets/sockets_kernel_2.cpp"
#include "../sockstreambuf/sockstreambuf_kernel_1.cpp" #include "../sockstreambuf/sockstreambuf_kernel_1.cpp"
#include "../sockstreambuf/sockstreambuf_kernel_2.cpp" #include "../sockstreambuf/sockstreambuf_kernel_2.cpp"
#include "../server/server_kernel.cpp"
#include "../server/server_iostream.cpp"
#include "../server/server_http.cpp"
#include "../threads/multithreaded_object_extension.cpp" #include "../threads/multithreaded_object_extension.cpp"
#include "../threads/threaded_object_extension.cpp" #include "../threads/threaded_object_extension.cpp"
#include "../threads/threads_kernel_1.cpp" #include "../threads/threads_kernel_1.cpp"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
// Copyright (C) 2003 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license.
#ifndef DLIB_SERVER_IOSTREAM_CPp_
#define DLIB_SERVER_IOSTREAM_CPp_
#include "server_iostream.h"
namespace dlib
{
const logger server_iostream::dlog("dlib.server_iostream");
}
#endif // DLIB_SERVER_IOSTREAM_CPp_
...@@ -143,10 +143,13 @@ namespace dlib ...@@ -143,10 +143,13 @@ namespace dlib
}; };
const logger server_iostream::dlog("dlib.server");
} }
#ifdef NO_MAKEFILE
#include "server_iostream.cpp"
#endif
#endif // DLIB_SERVER_IOSTREAm_1_ #endif // DLIB_SERVER_IOSTREAm_1_
......
...@@ -12,17 +12,11 @@ ...@@ -12,17 +12,11 @@
namespace dlib namespace dlib
{ {
template < class server_iostream : public server
typename server_base
>
class server_iostream : public server_base
{ {
/*! /*!
REQUIREMENTS ON server_base WHAT THIS EXTENSION DOES FOR server
is an implementation of server/server_kernel_abstract.h
WHAT THIS EXTENSION DOES FOR SERVER
This extension redefines the on_connect() function so that This extension redefines the on_connect() function so that
instead of giving you a connection object you get an istream instead of giving you a connection object you get an istream
and ostream object. and ostream object.
......
This diff is collapsed.
This diff is collapsed.
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#undef DLIB_SERVER_KERNEL_ABSTRACT_ #undef DLIB_SERVER_KERNEL_ABSTRACT_
#ifdef DLIB_SERVER_KERNEL_ABSTRACT_ #ifdef DLIB_SERVER_KERNEL_ABSTRACT_
// non-templatable dependencies
#include "../threads/threads_kernel_abstract.h" #include "../threads/threads_kernel_abstract.h"
#include "../sockets/sockets_kernel_abstract.h" #include "../sockets/sockets_kernel_abstract.h"
#include <string> #include <string>
...@@ -11,8 +10,6 @@ ...@@ -11,8 +10,6 @@
namespace dlib namespace dlib
{ {
class server class server
{ {
...@@ -244,8 +241,6 @@ namespace dlib ...@@ -244,8 +241,6 @@ namespace dlib
throws throws
- std::bad_alloc - std::bad_alloc
!*/ !*/
private: private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment