equal
deleted
inserted
replaced
|
1 --- stdcxx-4.2.1/tests/algorithms/25.libc.cpp 2008-04-24 20:23:21.000000000 -0400 |
|
2 +++ stdcxx-4.2.1/tests/algorithms/25.libc.cpp 2011-01-26 04:59:35.154999393 -0500 |
|
3 @@ -34,6 +34,12 @@ |
|
4 #include <rw_value.h> // for UserClass |
|
5 #include <driver.h> // for rw_test() |
|
6 |
|
7 +// If we do not define _RWSTD_NO_EXCEPTIONS, this test |
|
8 +// just throws. |
|
9 +#ifndef _RWSTD_NO_EXCEPTIONS |
|
10 +#define _RWSTD_NO_EXCEPTIONS |
|
11 +#endif |
|
12 + |
|
13 /**************************************************************************/ |
|
14 |
|
15 // used as a special value in comp below |
|
16 @@ -67,8 +73,11 @@ |
|
17 } |
|
18 } |
|
19 |
|
20 +#if defined(__SUNPRO_CC) |
|
21 +extern "C" { |
|
22 +#else |
|
23 extern "C++" { |
|
24 - |
|
25 +#endif |
|
26 static int cxx_comp (const void *x, const void *y) |
|
27 { |
|
28 #ifndef _RWSTD_NO_EXCEPTIONS |
|
29 @@ -157,7 +166,6 @@ |
|
30 _RWSTD_UNUSED (line); |
|
31 _RWSTD_UNUSED (src); |
|
32 _RWSTD_UNUSED (nsrc); |
|
33 - _RWSTD_UNUSED (key); |
|
34 _RWSTD_UNUSED (cxx); |
|
35 |
|
36 #endif // _RWSTD_NO_EXCEPTIONS |