Commit cffce9b0 authored by Davis King's avatar Davis King

Changed the pipe so you don't have to say pipe<type>::kernel_1a anymore. Now you

just say pipe<type>.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%404217
parent c57c860a
...@@ -6,27 +6,5 @@ ...@@ -6,27 +6,5 @@
#include "pipe/pipe_kernel_1.h" #include "pipe/pipe_kernel_1.h"
namespace dlib
{
template <
typename T
>
class pipe
{
pipe() {}
public:
//----------- kernels ---------------
// kernel_1a
typedef pipe_kernel_1<T>
kernel_1a;
};
}
#endif // DLIB_PIPe_ #endif // DLIB_PIPe_
...@@ -13,7 +13,7 @@ namespace dlib ...@@ -13,7 +13,7 @@ namespace dlib
template < template <
typename T typename T
> >
class pipe_kernel_1 class pipe
{ {
/*! /*!
INITIAL VALUE INITIAL VALUE
...@@ -60,14 +60,16 @@ namespace dlib ...@@ -60,14 +60,16 @@ namespace dlib
!*/ !*/
public: public:
// this is here for backwards compatibility with older versions of dlib.
typedef pipe kernel_1a;
typedef T type; typedef T type;
explicit pipe_kernel_1 ( explicit pipe (
unsigned long maximum_size unsigned long maximum_size
); );
virtual ~pipe_kernel_1 ( virtual ~pipe (
); );
void empty ( void empty (
...@@ -144,8 +146,8 @@ namespace dlib ...@@ -144,8 +146,8 @@ namespace dlib
bool enqueue_enabled; bool enqueue_enabled;
// restricted functions // restricted functions
pipe_kernel_1(const pipe_kernel_1&); // copy constructor pipe(const pipe&); // copy constructor
pipe_kernel_1& operator=(const pipe_kernel_1&); // assignment operator pipe& operator=(const pipe&); // assignment operator
}; };
...@@ -158,8 +160,8 @@ namespace dlib ...@@ -158,8 +160,8 @@ namespace dlib
template < template <
typename T typename T
> >
pipe_kernel_1<T>:: pipe<T>::
pipe_kernel_1 ( pipe (
unsigned long maximum_size unsigned long maximum_size
) : ) :
pipe_size(0), pipe_size(0),
...@@ -183,8 +185,8 @@ namespace dlib ...@@ -183,8 +185,8 @@ namespace dlib
template < template <
typename T typename T
> >
pipe_kernel_1<T>:: pipe<T>::
~pipe_kernel_1 ( ~pipe (
) )
{ {
auto_mutex M(m); auto_mutex M(m);
...@@ -209,7 +211,7 @@ namespace dlib ...@@ -209,7 +211,7 @@ namespace dlib
template < template <
typename T typename T
> >
void pipe_kernel_1<T>:: void pipe<T>::
empty ( empty (
) )
{ {
...@@ -226,7 +228,7 @@ namespace dlib ...@@ -226,7 +228,7 @@ namespace dlib
template < template <
typename T typename T
> >
void pipe_kernel_1<T>:: void pipe<T>::
wait_until_empty ( wait_until_empty (
) const ) const
{ {
...@@ -249,7 +251,7 @@ namespace dlib ...@@ -249,7 +251,7 @@ namespace dlib
template < template <
typename T typename T
> >
void pipe_kernel_1<T>:: void pipe<T>::
enable ( enable (
) )
{ {
...@@ -262,7 +264,7 @@ namespace dlib ...@@ -262,7 +264,7 @@ namespace dlib
template < template <
typename T typename T
> >
void pipe_kernel_1<T>:: void pipe<T>::
disable ( disable (
) )
{ {
...@@ -278,7 +280,7 @@ namespace dlib ...@@ -278,7 +280,7 @@ namespace dlib
template < template <
typename T typename T
> >
bool pipe_kernel_1<T>:: bool pipe<T>::
is_enabled ( is_enabled (
) const ) const
{ {
...@@ -291,7 +293,7 @@ namespace dlib ...@@ -291,7 +293,7 @@ namespace dlib
template < template <
typename T typename T
> >
unsigned long pipe_kernel_1<T>:: unsigned long pipe<T>::
max_size ( max_size (
) const ) const
{ {
...@@ -304,7 +306,7 @@ namespace dlib ...@@ -304,7 +306,7 @@ namespace dlib
template < template <
typename T typename T
> >
unsigned long pipe_kernel_1<T>:: unsigned long pipe<T>::
size ( size (
) const ) const
{ {
...@@ -317,7 +319,7 @@ namespace dlib ...@@ -317,7 +319,7 @@ namespace dlib
template < template <
typename T typename T
> >
bool pipe_kernel_1<T>:: bool pipe<T>::
enqueue ( enqueue (
T& item T& item
) )
...@@ -402,7 +404,7 @@ namespace dlib ...@@ -402,7 +404,7 @@ namespace dlib
template < template <
typename T typename T
> >
bool pipe_kernel_1<T>:: bool pipe<T>::
dequeue ( dequeue (
T& item T& item
) )
...@@ -463,7 +465,7 @@ namespace dlib ...@@ -463,7 +465,7 @@ namespace dlib
template < template <
typename T typename T
> >
bool pipe_kernel_1<T>:: bool pipe<T>::
enqueue_or_timeout ( enqueue_or_timeout (
T& item, T& item,
unsigned long timeout unsigned long timeout
...@@ -557,7 +559,7 @@ namespace dlib ...@@ -557,7 +559,7 @@ namespace dlib
template < template <
typename T typename T
> >
bool pipe_kernel_1<T>:: bool pipe<T>::
dequeue_or_timeout ( dequeue_or_timeout (
T& item, T& item,
unsigned long timeout unsigned long timeout
...@@ -626,7 +628,7 @@ namespace dlib ...@@ -626,7 +628,7 @@ namespace dlib
template < template <
typename T typename T
> >
void pipe_kernel_1<T>:: void pipe<T>::
wait_for_num_blocked_dequeues ( wait_for_num_blocked_dequeues (
unsigned long num unsigned long num
)const )const
...@@ -649,7 +651,7 @@ namespace dlib ...@@ -649,7 +651,7 @@ namespace dlib
template < template <
typename T typename T
> >
bool pipe_kernel_1<T>:: bool pipe<T>::
is_enqueue_enabled ( is_enqueue_enabled (
) const ) const
{ {
...@@ -662,7 +664,7 @@ namespace dlib ...@@ -662,7 +664,7 @@ namespace dlib
template < template <
typename T typename T
> >
void pipe_kernel_1<T>:: void pipe<T>::
disable_enqueue ( disable_enqueue (
) )
{ {
...@@ -677,7 +679,7 @@ namespace dlib ...@@ -677,7 +679,7 @@ namespace dlib
template < template <
typename T typename T
> >
void pipe_kernel_1<T>:: void pipe<T>::
enable_enqueue ( enable_enqueue (
) )
{ {
......
...@@ -532,7 +532,7 @@ namespace ...@@ -532,7 +532,7 @@ namespace
void perform_test ( void perform_test (
) )
{ {
pipe_kernel_test<dlib::pipe<int>::kernel_1a>(); pipe_kernel_test<dlib::pipe<int> >();
} }
} a; } a;
......
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