Commit d8ddd8db authored by Davis King's avatar Davis King

Fixed more Intel compiler incompatibilities.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402547
parent 2376f339
......@@ -200,7 +200,6 @@ namespace
for (unsigned long i = 0; i < a1.size(); ++i)
{
unsigned long a = static_cast<unsigned long>(rnd.get_random_32bit_number());
DLIB_CASSERT(a >= 0,"");
a1[i] = a;
a2[i] = i;
DLIB_CASSERT(a1[i] == a,"");
......@@ -328,7 +327,6 @@ namespace
for (unsigned long i = 0; i < a1.size(); ++i)
{
unsigned long a = static_cast<unsigned long>(rnd.get_random_32bit_number());
DLIB_CASSERT(a >= 0,"");
a1[i] = a;
a2[i] = i;
DLIB_CASSERT(a1[i] == a,"");
......
......@@ -30,7 +30,9 @@ namespace
// ----------------------------------------------------------------------------------------
template <typename ssb>
void thread_proc (
struct thread_proc_struct
{
static void thread_proc (
void* param
)
{
......@@ -107,6 +109,7 @@ namespace
delete [] bigbuf;
}
};
template <typename ssb>
void sockstreambuf_test (
......@@ -132,7 +135,7 @@ namespace
DLIB_CASSERT(false, "Unable to create a listener");
}
create_new_thread(thread_proc<ssb>,list);
create_new_thread(&thread_proc_struct<ssb>::thread_proc,list);
if (create_connection(con,list->get_listening_port(),"127.0.0.1"))
{
......
......@@ -11,6 +11,13 @@
#include <dlib/algs.h>
#include <typeinfo>
#ifdef __INTEL_COMPILER
// ignore the bogus warning about not overloading perform_test() all the way
#pragma warning (disable: 654)
#endif
namespace test
{
class tester;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment