diff --git a/dlib/algs.h b/dlib/algs.h
index 7bb5512b1..f6f2f6e71 100644
--- a/dlib/algs.h
+++ b/dlib/algs.h
@@ -348,19 +348,19 @@ namespace dlib
 
 // ----------------------------------------------------------------------------------------
 
-    /*!A is_const
+    /*!A is_const_type
 
-        This is a template where is_const<T>::value == true when T is a const 
+        This is a template where is_const_type<T>::value == true when T is a const 
         type ane false otherwise.
     !*/
 
     template <typename T>
-    struct is_const
+    struct is_const_type
     {
         static const bool value = false;
     };
     template <typename T>
-    struct is_const<const T>
+    struct is_const_type<const T>
     {
         static const bool value = true;
     };
diff --git a/dlib/member_function_pointer/member_function_pointer_kernel_1.h b/dlib/member_function_pointer/member_function_pointer_kernel_1.h
index 4e2a2d427..0190d7482 100644
--- a/dlib/member_function_pointer/member_function_pointer_kernel_1.h
+++ b/dlib/member_function_pointer/member_function_pointer_kernel_1.h
@@ -210,7 +210,7 @@ namespace dlib
 
         // the reason for putting disable_if on this function is that it avoids an overload
         // resolution bug in visual studio.
-        template <typename T> typename disable_if<is_const<T>,void>::type 
+        template <typename T> typename disable_if<is_const_type<T>,void>::type 
         set(T& object, typename mp_impl<T>::mfp_pointer_type cb) 
         { mp_impl_T<mp_impl<T> >(&object,cb).clone(mp_memory.data); }
 
@@ -269,7 +269,7 @@ namespace dlib
 
         // the reason for putting disable_if on this function is that it avoids an overload
         // resolution bug in visual studio.
-        template <typename T> typename disable_if<is_const<T>,void>::type 
+        template <typename T> typename disable_if<is_const_type<T>,void>::type 
         set(T& object, typename mp_impl<T>::mfp_pointer_type cb) 
         { mp_impl_T<mp_impl<T> >(&object,cb).clone(mp_memory.data); }
 
@@ -329,7 +329,7 @@ namespace dlib
 
         // the reason for putting disable_if on this function is that it avoids an overload
         // resolution bug in visual studio.
-        template <typename T> typename disable_if<is_const<T>,void>::type 
+        template <typename T> typename disable_if<is_const_type<T>,void>::type 
         set(T& object, typename mp_impl<T>::mfp_pointer_type cb) 
         { mp_impl_T<mp_impl<T> >(&object,cb).clone(mp_memory.data); }
 
@@ -390,7 +390,7 @@ namespace dlib
 
         // the reason for putting disable_if on this function is that it avoids an overload
         // resolution bug in visual studio.
-        template <typename T> typename disable_if<is_const<T>,void>::type 
+        template <typename T> typename disable_if<is_const_type<T>,void>::type 
         set(T& object, typename mp_impl<T>::mfp_pointer_type cb) 
         { mp_impl_T<mp_impl<T> >(&object,cb).clone(mp_memory.data); }
 
@@ -453,7 +453,7 @@ namespace dlib
 
         // the reason for putting disable_if on this function is that it avoids an overload
         // resolution bug in visual studio.
-        template <typename T> typename disable_if<is_const<T>,void>::type 
+        template <typename T> typename disable_if<is_const_type<T>,void>::type 
         set(T& object, typename mp_impl<T>::mfp_pointer_type cb) 
         { mp_impl_T<mp_impl<T> >(&object,cb).clone(mp_memory.data); }