| author | Rich Burridge <rich.burridge@oracle.com> |
| Wed, 16 Mar 2016 09:54:47 -0700 | |
| changeset 5617 | 58e4e2a36e77 |
| permissions | -rw-r--r-- |
|
5617
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
The /usr/lib/64/R/include/R_ext/Print.h makes the assumption that |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
__SUNPRO_CC == stlport which is incorrect in the way we deliver R in |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
the version that's in Solaris. |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
This problem has been reported upstream at: |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
https://bugs.r-project.org/bugzilla/show_bug.cgi?id=16767 |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
|
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
--- R-3.2.3/src/include/R_ext/Print.h.orig 2016-03-16 06:31:42.210416076 -0700 |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
+++ R-3.2.3/src/include/R_ext/Print.h 2016-03-16 06:52:39.625133958 -0700 |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
@@ -27,7 +27,7 @@ |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
defined in namespace std. */ |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
# ifdef R_USE_C99_IN_CXX |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
# include <cstdarg> |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
-# ifdef __SUNPRO_CC |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
+# if defined(__SUNPRO_CC) && defined(_STLP_VENDOR_CSTD) |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
using _STLP_VENDOR_CSTD::va_list; |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
# endif |
|
58e4e2a36e77
22949613 R incorrectly assumes __SUNPRO_CC == stlport
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
# endif |