Minor changes to avoid compiler errors in visual studio 2013

dlib/binary_search_tree/binary_search_tree_kernel_c.h

@@ -43,12 +43,30 @@ namespace dlib
                 range& r
             );
 
-            const map_pair<domain,range>& element (
-            ) const;
+            const map_pair<domain, range>& element(
+            ) const
+            {
+                DLIB_CASSERT(this->current_element_valid() == true,
+                    "\tconst map_pair<domain,range>& binary_search_tree::element() const"
+                    << "\n\tyou can't access the current element if it doesn't exist"
+                    << "\n\tthis: " << this
+                );
 
-            map_pair<domain,range>& element (
+                return bst_base::element();
+            }
+
+            map_pair<domain, range>& element(
+            )
+            {
+                DLIB_CASSERT(this->current_element_valid() == true,
+                    "\tmap_pair<domain,range>& binary_search_tree::element()"
+                    << "\n\tyou can't access the current element if it doesn't exist"
+                    << "\n\tthis: " << this
                 );
 
+                return bst_base::element();
+            }
+
             void remove_last_in_order (
                 domain& d,
                 range& r
@@ -168,42 +186,6 @@ namespace dlib
         bst_base::remove_any(d,r);
     }
  
-// ----------------------------------------------------------------------------------------
-
-    template <
-        typename bst_base
-        >
-    const map_pair<typename bst_base::domain_type,typename bst_base::range_type>& binary_search_tree_kernel_c<bst_base>::
-    element (
-    ) const
-    {
-        DLIB_CASSERT(this->current_element_valid() == true,
-            "\tconst map_pair<domain,range>& binary_search_tree::element() const"
-            << "\n\tyou can't access the current element if it doesn't exist"
-            << "\n\tthis: " << this
-            );
-
-        return bst_base::element();
-    }
-
-// ----------------------------------------------------------------------------------------
-
-    template <
-        typename bst_base
-        >
-    map_pair<typename bst_base::domain_type,typename bst_base::range_type>& binary_search_tree_kernel_c<bst_base>::
-    element (
-    ) 
-    {
-        DLIB_CASSERT(this->current_element_valid() == true,
-            "\tmap_pair<domain,range>& binary_search_tree::element()"
-            << "\n\tyou can't access the current element if it doesn't exist"
-            << "\n\tthis: " << this
-            );
-
-        return bst_base::element();
-    }
-
 // ----------------------------------------------------------------------------------------
 
     template <

dlib/hash_table/hash_table_kernel_c.h

@@ -54,11 +54,29 @@ namespace dlib
             );
 
             const map_pair<domain,range>& element (
-            ) const;
+            ) const
+            {
+                DLIB_CASSERT(this->current_element_valid() == true,
+                    "\tconst map_pair<domain,range>& hash_table::element() const"
+                    << "\n\tyou can't access the current element if it doesn't exist"
+                    << "\n\tthis: " << this
+                    );
+
+                return ht_base::element();
+            }
 
             map_pair<domain,range>& element (
+            )
+            {
+                DLIB_CASSERT(this->current_element_valid() == true,
+                    "\tmap_pair<domain,range>& hash_table::element()"
+                    << "\n\tyou can't access the current element if it doesn't exist"
+                    << "\n\tthis: " << this
                     );
 
+                return ht_base::element();
+            }
+
 
     };
 
@@ -168,42 +186,6 @@ namespace dlib
         ht_base::remove_any(d,r);
     }
 
-// ----------------------------------------------------------------------------------------
-
-    template <
-        typename ht_base        
-        >
-    const map_pair<typename ht_base::domain_type,typename ht_base::range_type>& hash_table_kernel_c<ht_base>::
-    element (
-    ) const
-    {
-        DLIB_CASSERT(this->current_element_valid() == true,
-            "\tconst map_pair<domain,range>& hash_table::element() const"
-            << "\n\tyou can't access the current element if it doesn't exist"
-            << "\n\tthis: " << this
-            );
-
-        return ht_base::element();
-    }
-
-// ----------------------------------------------------------------------------------------
-
-    template <
-        typename ht_base        
-        >
-    map_pair<typename ht_base::domain_type,typename ht_base::range_type>& hash_table_kernel_c<ht_base>::
-    element (
-    ) 
-    {
-        DLIB_CASSERT(this->current_element_valid() == true,
-            "\tmap_pair<domain,range>& hash_table::element()"
-            << "\n\tyou can't access the current element if it doesn't exist"
-            << "\n\tthis: " << this
-            );
-
-        return ht_base::element();
-    }
-
 // ----------------------------------------------------------------------------------------
 
 }

dlib/map/map_kernel_c.h

@@ -50,11 +50,33 @@ namespace dlib
             ) const;
 
             const map_pair<domain,range>& element (
-            ) const;
+            ) const
+            {
+                // make sure requires clause is not broken
+                DLIB_CASSERT(this->current_element_valid() == true,
+                    "\tconst map_pair<domain,range>& map::element"
+                    << "\n\tyou can't access the current element if it doesn't exist"
+                    << "\n\tthis: " << this
+                    );
+
+                // call the real function
+                return map_base::element();
+            }
 
             map_pair<domain,range>& element (
+            )
+            {
+                // make sure requires clause is not broken
+                DLIB_CASSERT(this->current_element_valid() == true,
+                    "\tmap_pair<domain,range>& map::element"
+                    << "\n\tyou can't access the current element if it doesn't exist"
+                    << "\n\tthis: " << this
                     );
 
+                // call the real function
+                return map_base::element();
+            }
+
     };
 
     template <
@@ -218,46 +240,6 @@ namespace dlib
         return map_base::operator[](d);
     }
     
-// ----------------------------------------------------------------------------------------
-
-    template <
-        typename map_base
-        >
-    const map_pair<typename map_base::domain_type,typename map_base::range_type>& map_kernel_c<map_base>::
-    element (
-    ) const
-    {
-        // make sure requires clause is not broken
-        DLIB_CASSERT(this->current_element_valid() == true,
-            "\tconst map_pair<domain,range>& map::element"
-            << "\n\tyou can't access the current element if it doesn't exist"
-            << "\n\tthis: " << this
-            );
-
-        // call the real function
-        return map_base::element();
-    }
-
-// ----------------------------------------------------------------------------------------
-
-    template <
-        typename map_base
-        >
-    map_pair<typename map_base::domain_type,typename map_base::range_type>& map_kernel_c<map_base>::
-    element (
-    ) 
-    {
-        // make sure requires clause is not broken
-        DLIB_CASSERT(this->current_element_valid() == true,
-            "\tmap_pair<domain,range>& map::element"
-            << "\n\tyou can't access the current element if it doesn't exist"
-            << "\n\tthis: " << this
-            );
-
-        // call the real function
-        return map_base::element();
-    }
-
 // ----------------------------------------------------------------------------------------
 
 }

dlib/test/geometry.cpp

@@ -107,7 +107,7 @@ namespace
         DLIB_TEST(rect2 == rect1);
         DLIB_TEST(p2 == p1);
         DLIB_TEST(v2 == v1);
-        DLIB_TEST(sin);
+        DLIB_TEST(sin.good());
         DLIB_TEST(sin.get() == EOF);
 
 

dlib/test/matrix3.cpp

@@ -1058,16 +1058,16 @@ namespace
         {
             istringstream sin(" 1 2\n3");
             matrix<double> m;
-            DLIB_TEST(sin);
+            DLIB_TEST(sin.good());
             sin >> m;
-            DLIB_TEST(!sin);
+            DLIB_TEST(!sin.good());
         }
         {
             istringstream sin("");
             matrix<double> m;
-            DLIB_TEST(sin);
+            DLIB_TEST(sin.good());
             sin >> m;
-            DLIB_TEST(!sin);
+            DLIB_TEST(!sin.good());
         }
     }