Merging upstream version 1.44.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 48 insertions, 0 deletions

diff --git a/ml/dlib/dlib/test/binary_search_tree_mm2.cpp b/ml/dlib/dlib/test/binary_search_tree_mm2.cpp
new file mode 100644
index 000000000..354b1f91c
--- /dev/null
+++ b/ml/dlib/dlib/test/binary_search_tree_mm2.cpp
@@ -0,0 +1,48 @@
+// Copyright (C) 2003  Davis E. King (davis@dlib.net)
+// License: Boost Software License   See LICENSE.txt for the full license.
+#ifndef DLIB_BINARY_SEARCH_TREE_KERNEl_TEST_
+#define DLIB_BINARY_SEARCH_TREE_KERNEl_TEST_
+
+
+#include <sstream>
+#include <string>
+#include <cstdlib>
+#include <ctime>
+
+#include <dlib/memory_manager_global.h>
+#include <dlib/memory_manager_stateless.h>
+#include <dlib/binary_search_tree.h>
+#include "tester.h"
+#include "binary_search_tree.h"
+
+namespace  
+{
+
+    class binary_search_tree_tester : public tester
+    {
+
+    public:
+        binary_search_tree_tester (
+        ) :
+            tester ("test_binary_search_tree_mm2",
+                    "Runs tests on the binary_search_tree component with memory managers.")
+        {}
+
+        void perform_test (
+        )
+        {
+            dlog << LINFO << "testing kernel_1a /w memory_manager_stateless_2";
+            binary_search_tree_kernel_test<binary_search_tree<int,int, 
+            memory_manager_stateless<char>::kernel_2_2c>::kernel_1a>();
+            print_spinner();
+
+            dlog << LINFO << "testing kernel_1a /w memory_manager_3";
+            binary_search_tree_kernel_test<binary_search_tree<int,int, 
+            memory_manager<char>::kernel_3b>::kernel_1a>();
+            print_spinner();
+        }
+    } a;
+
+}
+
+#endif