All I did in this change was rename memory_manager<char>::kernel_1a to default_memory_manager.

default_memory_manager is way more readable and clear.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%404080

dlib/hash_map/hash_map_kernel_1.h

@@ -11,7 +11,6 @@
 #include "../interfaces/remover.h"
 #include "../assert.h"
 #include "../serialize.h"
-#include "../memory_manager.h"
 
 namespace dlib
 {
@@ -21,7 +20,7 @@ namespace dlib
         typename range,
         unsigned long expnum,
         typename hash_table,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager
         >
     class hash_map_kernel_1 : public enumerable<map_pair<domain,range> >,
                               public pair_remover<domain,range>

dlib/hash_map/hash_map_kernel_abstract.h

@@ -8,7 +8,7 @@
 #include "../interfaces/remover.h"
 #include "../interfaces/map_pair.h"
 #include "../serialize.h"
-#include "../memory_manager/memory_manager_kernel_abstract.h"
+#include "../algs.h"
 #include <functional>
 
 namespace dlib
@@ -18,7 +18,7 @@ namespace dlib
         typename domain,
         typename range,
         unsigned long expnum,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         typename compare = std::less<T>
         >
     class hash_map : public enumerable<map_pair<domain,range> >,

dlib/hash_set.h

@@ -10,7 +10,7 @@
 #include "algs.h"
 
 
-#include "memory_manager.h"
+#include "algs.h"
 #include <functional>
 
 
@@ -20,7 +20,7 @@ namespace dlib
     template <
         typename T,
         unsigned long expnum,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         typename compare = std::less<T>
         >
     class hash_set

dlib/hash_set/hash_set_kernel_1.h

@@ -10,7 +10,6 @@
 #include "../interfaces/remover.h"
 #include "../assert.h"
 #include "../serialize.h"
-#include "../memory_manager.h"
 
 namespace dlib
 {
@@ -19,7 +18,7 @@ namespace dlib
         typename T,
         unsigned long expnum,
         typename hash_table,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager 
         >
     class hash_set_kernel_1 : public enumerable<const T>,
                               public remover<T>

dlib/hash_set/hash_set_kernel_abstract.h

@@ -7,7 +7,7 @@
 #include "../interfaces/enumerable.h"
 #include "../interfaces/remover.h"
 #include "../serialize.h"
-#include "../memory_manager/memory_manager_kernel_abstract.h"
+#include "../algs.h"
 #include <functional>
 
 namespace dlib
@@ -16,7 +16,7 @@ namespace dlib
     template <
         typename T,
         unsigned long expnum,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         typename compare = std::less<T>
         >
     class hash_set : public enumerable<const T>,

dlib/hash_table.h

@@ -7,7 +7,7 @@
 #include "hash_table/hash_table_kernel_1.h"
 #include "hash_table/hash_table_kernel_2.h"
 #include "hash_table/hash_table_kernel_c.h"
-#include "memory_manager.h"
+#include "algs.h"
 
 #include "binary_search_tree.h"
 #include <functional>
@@ -19,7 +19,7 @@ namespace dlib
     template <
         typename domain,
         typename range,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         typename compare = std::less<domain>
         >
     class hash_table

dlib/hash_table/hash_table_kernel_1.h

@@ -11,7 +11,6 @@
 #include "../interfaces/remover.h"
 #include "../assert.h"
 #include "../serialize.h"
-#include "../memory_manager.h"
 #include <functional>
 
 
@@ -21,7 +20,7 @@ namespace dlib
     template <
         typename domain,
         typename range,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         typename compare = std::less<domain>
         >
     class hash_table_kernel_1 : public enumerable<map_pair<domain, range> >,

dlib/hash_table/hash_table_kernel_2.h

@@ -11,7 +11,6 @@
 #include "../interfaces/remover.h"
 #include "../assert.h"
 #include "../serialize.h"
-#include "../memory_manager.h"
 #include <functional>
 
 namespace dlib 
@@ -21,7 +20,7 @@ namespace dlib
         typename domain,
         typename range,
         typename bst_base,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         typename compare = std::less<domain>
         >
     class hash_table_kernel_2 : public enumerable<map_pair<domain,range> >,

dlib/hash_table/hash_table_kernel_abstract.h

@@ -8,7 +8,7 @@
 #include "../interfaces/enumerable.h"
 #include "../interfaces/remover.h"
 #include "../serialize.h"
-#include "../memory_manager/memory_manager_kernel_abstract.h"
+#include "../algs.h"
 #include <functional>
 
 namespace dlib 
@@ -17,7 +17,7 @@ namespace dlib
     template <
         typename domain,
         typename range,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         typename compare = std::less<domain>
         >
     class hash_table : public enumerable<map_pair<domain,range> >,

dlib/map.h

@@ -9,7 +9,7 @@
 #include "binary_search_tree.h"
 
 
-#include "memory_manager.h"
+#include "algs.h"
 #include <functional>
 
 
@@ -19,7 +19,7 @@ namespace dlib
     template <
         typename domain,
         typename range,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         typename compare = std::less<domain>
         >
     class map

dlib/map/map_kernel_1.h

@@ -9,7 +9,6 @@
 #include "../interfaces/map_pair.h"
 #include "../interfaces/remover.h"
 #include "../serialize.h"
-#include "../memory_manager.h"
 
 namespace dlib
 {
@@ -18,7 +17,7 @@ namespace dlib
         typename domain,
         typename range,
         typename bst_base,  
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager 
         >
     class map_kernel_1 : public enumerable<map_pair<domain,range> >,
                          public asc_pair_remover<domain,range,typename bst_base::compare_type>

dlib/map/map_kernel_abstract.h

@@ -7,7 +7,7 @@
 #include "../interfaces/enumerable.h"
 #include "../interfaces/remover.h"
 #include "../serialize.h"
-#include "../memory_manager/memory_manager_kernel_abstract.h"
+#include "../algs.h"
 #include <functional>
 
 namespace dlib
@@ -16,7 +16,7 @@ namespace dlib
     template <
         typename domain,
         typename range,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         typename compare = std::less<domain>
         >
     class map : public enumerable<map_pair<domain,range> >, 

dlib/matrix/matrix_abstract.h

@@ -5,7 +5,7 @@
 
 #include "matrix_exp_abstract.h"
 #include "../serialize.h"
-#include "../memory_manager.h"
+#include "../algs.h"
 #include "matrix_data_layout_abstract.h"
 
 namespace dlib
@@ -183,7 +183,7 @@ namespace dlib
         typename T,
         long num_rows = 0,
         long num_cols = 0,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         typename layout = row_major_layout 
         >
     class matrix : public matrix_exp<matrix<T,num_rows,num_cols,mem_manager,layout> > 

dlib/matrix/matrix_expressions.h

@@ -33,7 +33,7 @@ namespace dlib
     {
         typedef T type;
         typedef const T const_ret_type;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef row_major_layout layout_type;
         const static long NR = 1;
         const static long NC = 0;
@@ -140,7 +140,7 @@ namespace dlib
     {
         typedef T type;
         typedef const T const_ret_type;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef row_major_layout layout_type;
         const static long NR = 1;
         const static long NC = 0;
@@ -220,7 +220,7 @@ namespace dlib
     {
         typedef long type;
         typedef const long const_ret_type;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         const static long NR = 1;
         const static long NC = tabs<(end - start)>::value/inc_ + 1;
         const static long cost = 1;

dlib/matrix/matrix_fwd.h

@@ -3,7 +3,7 @@
 #ifndef DLIB_MATRIx_FWD
 #define DLIB_MATRIx_FWD
 
-#include "../memory_manager.h"
+#include "../algs.h"
 
 namespace dlib
 {
@@ -18,7 +18,7 @@ namespace dlib
         typename T,
         long num_rows = 0,
         long num_cols = 0,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         typename layout = row_major_layout 
         >
     class matrix; 

dlib/matrix/matrix_utilities.h

@@ -367,7 +367,7 @@ namespace dlib
         const static long NC = 1;
         typedef typename T::value_type type;
         typedef const typename T::value_type& const_ret_type;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef row_major_layout layout_type;
 
         const_ret_type apply (long r, long ) const { return vect[r]; }
@@ -420,7 +420,7 @@ namespace dlib
         const static long NC = 1;
         typedef T type;
         typedef const T& const_ret_type;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef row_major_layout layout_type;
 
         const_ret_type apply (long r, long ) const { return ptr[r]; }
@@ -466,7 +466,7 @@ namespace dlib
         const static long NC = 0;
         typedef T type;
         typedef const T& const_ret_type;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef row_major_layout layout_type;
 
         const_ret_type apply (long r, long c) const { return ptr[r*cols + c]; }
@@ -1811,7 +1811,7 @@ namespace dlib
         const static long cost = 1;
         const static long NR = 0;
         const static long NC = 0;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef row_major_layout layout_type;
         typedef T type;
         typedef const T& const_ret_type;
@@ -1895,7 +1895,7 @@ namespace dlib
         const static long cost = 1;
         const static long NR = NR_;
         const static long NC = NC_;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef row_major_layout layout_type;
         typedef T type;
         typedef const T& const_ret_type;
@@ -1934,7 +1934,7 @@ namespace dlib
         const static long cost = 1;
         const static long NR = NR_;
         const static long NC = NC_;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef row_major_layout layout_type;
         typedef T type;
         typedef const T const_ret_type;
@@ -2003,7 +2003,7 @@ namespace dlib
         const static long cost = 1;
         const static long NR = 0;
         const static long NC = 0;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef row_major_layout layout_type;
         typedef T type;
         typedef const T const_ret_type;
@@ -2109,7 +2109,7 @@ namespace dlib
         const static long cost = 1;
         const static long NR = N;
         const static long NC = N;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef row_major_layout layout_type;
         typedef T type;
         typedef const T const_ret_type;
@@ -2226,7 +2226,7 @@ namespace dlib
         const static long cost = 1;
         const static long NR = N;
         const static long NC = N;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef row_major_layout layout_type;
         typedef T type;
         typedef const T const_ret_type;

dlib/queue.h

@@ -10,14 +10,14 @@
 #include "queue/queue_sort_1.h"
 
 
-#include "memory_manager.h"
+#include "algs.h"
 
 namespace dlib
 {
 
     template <
         typename T,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager 
         >
     class queue
     {

dlib/queue/queue_kernel_1.h

@@ -8,14 +8,13 @@
 #include "../interfaces/enumerable.h"
 #include "../interfaces/remover.h"
 #include "../serialize.h"
-#include "../memory_manager.h"
 
 namespace dlib
 {
 
     template <
         typename T,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager
         >
     class queue_kernel_1 : public enumerable<T>,
                            public remover<T>

dlib/queue/queue_kernel_2.h

@@ -9,7 +9,6 @@
 #include "../interfaces/enumerable.h"
 #include "../interfaces/remover.h"
 #include "../serialize.h"
-#include "../memory_manager.h"
 
 namespace dlib
 {
@@ -17,7 +16,7 @@ namespace dlib
     template <
         typename T,
         unsigned long block_size,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager
         >
     class queue_kernel_2 : public enumerable<T>,
                            public remover<T>

dlib/queue/queue_kernel_abstract.h

@@ -6,14 +6,14 @@
 #include "../interfaces/enumerable.h"
 #include "../interfaces/remover.h"
 #include "../serialize.h"
-#include "../memory_manager/memory_manager_kernel_abstract.h"
+#include "../algs.h"
 
 namespace dlib
 {
 
     template <
         typename T,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager
         >
     class queue : public enumerable<T>,
                   public remover<T>