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/any/any_decision_function.h

@@ -5,7 +5,6 @@
 
 #include "any.h"
 #include "../smart_pointers.h"
-#include "../memory_manager.h"
 
 #include "any_decision_function_abstract.h"
 
@@ -25,7 +24,7 @@ namespace dlib
 
         typedef sample_type_ sample_type;
         typedef scalar_type_ scalar_type;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
 
         any_decision_function()
         {

dlib/any/any_decision_function_abstract.h

@@ -4,7 +4,7 @@
 #ifdef DLIB_AnY_DECISION_FUNCTION_ABSTRACT_H_
 
 #include "any_abstract.h"
-#include "../memory_manager.h"
+#include "../algs.h"
 
 namespace dlib
 {
@@ -38,7 +38,7 @@ namespace dlib
 
         typedef sample_type_ sample_type;
         typedef scalar_type_ scalar_type;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
 
         any_decision_function(
         );

dlib/any/any_trainer.h

@@ -7,7 +7,6 @@
 #include "../smart_pointers.h"
 
 #include "any_decision_function.h"
-#include "../memory_manager.h"
 
 #include "any_trainer_abstract.h"
 #include <vector>
@@ -26,7 +25,7 @@ namespace dlib
     public:
         typedef sample_type_ sample_type;
         typedef scalar_type_ scalar_type;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef any_decision_function<sample_type, scalar_type> trained_function_type;
 
 

dlib/any/any_trainer_abstract.h

@@ -4,7 +4,7 @@
 #ifdef DLIB_AnY_TRAINER_ABSTRACT_H_
 
 #include "any_abstract.h"
-#include "../memory_manager.h"
+#include "../algs.h"
 #include "any_decision_function_abstract.h"
 #include <vector>
 
@@ -47,7 +47,7 @@ namespace dlib
 
         typedef sample_type_ sample_type;
         typedef scalar_type_ scalar_type;
-        typedef memory_manager<char>::kernel_1a mem_manager_type;
+        typedef default_memory_manager mem_manager_type;
         typedef any_decision_function<sample_type, scalar_type> trained_function_type;
 
         any_trainer(

dlib/array.h

@@ -12,15 +12,14 @@
 #include "array/array_expand_1.h"
 #include "array/array_expand_c.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 array
     {

dlib/array/array_kernel_1.h

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

dlib/array/array_kernel_2.h

@@ -13,7 +13,7 @@ namespace dlib
 
     template <
         typename T,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager 
         >
     class array_kernel_2 : public enumerable<T>
     {

dlib/array/array_kernel_abstract.h

@@ -5,14 +5,14 @@
 
 #include "../interfaces/enumerable.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 array : public enumerable<T>
     {

dlib/array2d.h

@@ -6,7 +6,7 @@
 
 #include "array2d/array2d_kernel_1.h"
 #include "array2d/array2d_kernel_c.h"
-#include "memory_manager.h"
+#include "algs.h"
 
 
 
@@ -16,7 +16,7 @@ namespace dlib
 
     template <
         typename T,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager 
         >
     class array2d
     {

dlib/array2d/array2d_kernel_1.h

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

dlib/array2d/array2d_kernel_abstract.h

@@ -5,7 +5,7 @@
 
 #include "../interfaces/enumerable.h"
 #include "../serialize.h"
-#include "../memory_manager/memory_manager_kernel_abstract.h"
+#include "../algs.h"
 #include "../geometry/rectangle_abstract.h"
 
 namespace dlib
@@ -13,7 +13,7 @@ namespace dlib
 
     template <
         typename T,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager 
         >
     class array2d : public enumerable<T>
     {

dlib/binary_search_tree.h

@@ -9,7 +9,7 @@
 #include "binary_search_tree/binary_search_tree_kernel_c.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 binary_search_tree

dlib/binary_search_tree/binary_search_tree_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 binary_search_tree : public enumerable<map_pair<domain,range> >, 

dlib/directed_graph.h

@@ -5,7 +5,7 @@
 
 #include "directed_graph/directed_graph_kernel_1.h"
 
-#include "memory_manager.h"
+#include "algs.h"
 
 namespace dlib
 {
@@ -13,7 +13,7 @@ namespace dlib
     template <
         typename T,
         typename E = char,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager
         >
     class directed_graph 
     {

dlib/directed_graph/directed_graph_kernel_1.h

@@ -9,7 +9,6 @@
 #include "../smart_pointers.h"
 #include "../algs.h"
 #include <vector>
-#include "../memory_manager.h"
 #include "directed_graph_kernel_abstract.h"
 #include "../is_kind.h"
 
@@ -207,7 +206,7 @@ namespace dlib
     template <
         typename T,
         typename E = char,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         bool is_checked = true 
         >
     class directed_graph_kernel_1 : noncopyable

dlib/directed_graph/directed_graph_kernel_abstract.h

@@ -4,7 +4,7 @@
 #ifdef DLIB_DIRECTED_GRAPH_KERNEl_ABSTRACT_
 
 #include "../serialize.h"
-#include "../memory_manager/memory_manager_kernel_abstract.h"
+#include "../algs.h"
 #include "../noncopyable.h"
 
 namespace dlib
@@ -13,7 +13,7 @@ namespace dlib
     template <
         typename T,
         typename E = char,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager 
         >
     class directed_graph : noncopyable
     {

dlib/graph.h

@@ -5,7 +5,7 @@
 
 #include "graph/graph_kernel_1.h"
 
-#include "memory_manager.h"
+#include "algs.h"
 
 namespace dlib
 {
@@ -13,7 +13,7 @@ namespace dlib
     template <
         typename T,
         typename E = char,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager 
         >
     class graph 
     {

dlib/graph/graph_kernel_1.h

@@ -9,7 +9,6 @@
 #include "../smart_pointers.h"
 #include "../algs.h"
 #include <vector>
-#include "../memory_manager.h"
 #include "graph_kernel_abstract.h"
 #include "../is_kind.h"
 
@@ -175,7 +174,7 @@ namespace dlib
     template <
         typename T,
         typename E = char,
-        typename mem_manager = memory_manager<char>::kernel_1a,
+        typename mem_manager = default_memory_manager,
         bool is_checked = true 
         >
     class graph_kernel_1 : noncopyable

dlib/graph/graph_kernel_abstract.h

@@ -4,7 +4,7 @@
 #ifdef DLIB_GRAPH_KERNEl_ABSTRACT_
 
 #include "../serialize.h"
-#include "../memory_manager/memory_manager_kernel_abstract.h"
+#include "../algs.h"
 #include "../noncopyable.h"
 
 namespace dlib
@@ -13,7 +13,7 @@ namespace dlib
     template <
         typename T,
         typename E = char,
-        typename mem_manager = memory_manager<char>::kernel_1a
+        typename mem_manager = default_memory_manager 
         >
     class graph : noncopyable
     {

dlib/hash_map.h

@@ -9,7 +9,7 @@
 #include "hash_table.h"
 #include "algs.h"
 
-#include "memory_manager.h"
+#include "algs.h"
 #include <functional>
 
 namespace dlib
@@ -19,7 +19,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<domain>
         >
     class hash_map