Added scope qualifiers to dlib::array so there isn't a name conflict

on C++11 compilers.

dlib/test/array.cpp

@@ -18,6 +18,8 @@ namespace
     using namespace dlib;
     using namespace std;
 
+    using dlib::array;
+
     logger dlog("test.array");
 
     template <

dlib/test/object_detector.cpp

@@ -355,7 +355,7 @@ namespace
         print_spinner();
         dlog << LINFO << "test_1()";
 
-        typedef array<array2d<unsigned char> >  grayscale_image_array_type;
+        typedef dlib::array<array2d<unsigned char> >  grayscale_image_array_type;
         grayscale_image_array_type images;
         std::vector<std::vector<rectangle> > object_locations;
         make_simple_test_data(images, object_locations);
@@ -397,7 +397,7 @@ namespace
         print_spinner();
         dlog << LINFO << "test_1m()";
 
-        typedef array<array2d<unsigned char> >  grayscale_image_array_type;
+        typedef dlib::array<array2d<unsigned char> >  grayscale_image_array_type;
         grayscale_image_array_type images;
         std::vector<std::vector<full_object_detection> > object_locations;
         make_simple_test_data(images, object_locations);
@@ -445,7 +445,7 @@ namespace
         print_spinner();
         dlog << LINFO << "test_1_fine_hog()";
 
-        typedef array<array2d<unsigned char> >  grayscale_image_array_type;
+        typedef dlib::array<array2d<unsigned char> >  grayscale_image_array_type;
         grayscale_image_array_type images;
         std::vector<std::vector<rectangle> > object_locations;
         make_simple_test_data(images, object_locations);
@@ -487,7 +487,7 @@ namespace
         print_spinner();
         dlog << LINFO << "test_1_poly()";
 
-        typedef array<array2d<unsigned char> >  grayscale_image_array_type;
+        typedef dlib::array<array2d<unsigned char> >  grayscale_image_array_type;
         grayscale_image_array_type images;
         std::vector<std::vector<rectangle> > object_locations;
         make_simple_test_data(images, object_locations);
@@ -529,7 +529,7 @@ namespace
         print_spinner();
         dlog << LINFO << "test_1_poly()";
 
-        typedef array<array2d<unsigned char> >  grayscale_image_array_type;
+        typedef dlib::array<array2d<unsigned char> >  grayscale_image_array_type;
         grayscale_image_array_type images;
         std::vector<std::vector<full_object_detection> > object_locations;
         make_simple_test_data(images, object_locations);
@@ -577,7 +577,7 @@ namespace
         print_spinner();
         dlog << LINFO << "test_1_poly_nn()";
 
-        typedef array<array2d<unsigned char> >  grayscale_image_array_type;
+        typedef dlib::array<array2d<unsigned char> >  grayscale_image_array_type;
         grayscale_image_array_type images;
         std::vector<std::vector<rectangle> > object_locations;
         make_simple_test_data(images, object_locations);
@@ -623,7 +623,7 @@ namespace
         print_spinner();
         dlog << LINFO << "test_2()";
 
-        typedef array<array2d<unsigned char> >  grayscale_image_array_type;
+        typedef dlib::array<array2d<unsigned char> >  grayscale_image_array_type;
         grayscale_image_array_type images;
         std::vector<std::vector<rectangle> > object_locations;
         make_simple_test_data(images, object_locations);
@@ -708,8 +708,8 @@ namespace
         dlog << LINFO << "test_3()";
 
 
-        typedef array<array2d<unsigned char> >  grayscale_image_array_type;
-        typedef array<funny_image>  funny_image_array_type;
+        typedef dlib::array<array2d<unsigned char> >  grayscale_image_array_type;
+        typedef dlib::array<funny_image>  funny_image_array_type;
         grayscale_image_array_type images_temp;
         funny_image_array_type images;
         std::vector<std::vector<rectangle> > object_locations;

dlib/test/scan_image.cpp

@@ -24,6 +24,8 @@ namespace
     using namespace dlib;
     using namespace std;
 
+    using dlib::array;
+
     // Declare the logger we will use in this test.  The name of the tester 
     // should start with "test."
     logger dlog("test.scan_image");

dlib/test/sockets2.cpp

@@ -128,7 +128,7 @@ namespace
             start();
 
 
-            array<scoped_ptr<connection> > cons;
+            dlib::array<scoped_ptr<connection> > cons;
             std::vector<long> bytes_received(6,0);
             scoped_ptr<connection> con_temp;
             

examples/object_detector_advanced_ex.cpp

@@ -191,7 +191,7 @@ int main()
     try
     {
         // Get some data 
-        array<array2d<unsigned char> > images;
+        dlib::array<array2d<unsigned char> > images;
         std::vector<std::vector<rectangle> > object_locations;
         make_simple_test_data(images, object_locations);
 

examples/object_detector_ex.cpp

@@ -101,7 +101,7 @@ int main()
     try
     {
         // The first thing we do is create the set of 3 images discussed above.  
-        array<array2d<unsigned char> > images;
+        dlib::array<array2d<unsigned char> > images;
         std::vector<std::vector<rectangle> > object_locations;
         make_simple_test_data(images, object_locations);
 

examples/train_object_detector.cpp

@@ -144,7 +144,7 @@ int main(int argc, char** argv)
                 return EXIT_FAILURE;
             }
 
-            array<array2d<unsigned char> > images;
+            dlib::array<array2d<unsigned char> > images;
             std::vector<std::vector<rectangle> > object_locations;
 
             cout << "Loading image dataset from metadata file " << parser[0] << endl;
@@ -240,7 +240,7 @@ int main(int argc, char** argv)
         object_detector<image_scanner_type> detector;
         deserialize(detector, fin);
 
-        array<array2d<unsigned char> > images;
+        dlib::array<array2d<unsigned char> > images;
         // Check if the command line argument is an XML file
         if (tolower(right_substr(parser[0],".")) == "xml")
         {