You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2008/02/20 02:35:18 UTC
svn commit: r629306 - in /stdcxx/trunk/util: aliases.cpp locale.cpp
memchk.cpp
Author: sebor
Date: Tue Feb 19 17:35:15 2008
New Revision: 629306
URL: http://svn.apache.org/viewvc?rev=629306&view=rev
Log:
2008-02-19 Martin Sebor <se...@roguewave.com>
STDCXX-736
* util/locale.cpp [_RWSTD_EDG_ECCP]: Suppressed EDG eccp error #450-D:
the type "long long" is nonstandard, issued for uses of the type in
the Linux pthreadtypes.h system header.
* util/aliases.cpp [_RWSTD_EDG_ECCP]: Same.
* util/memchk.cpp [_RWSTD_EDG_ECCP && !_WIN32](getpagesize): Declared.
Modified:
stdcxx/trunk/util/aliases.cpp
stdcxx/trunk/util/locale.cpp
stdcxx/trunk/util/memchk.cpp
Modified: stdcxx/trunk/util/aliases.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/aliases.cpp?rev=629306&r1=629305&r2=629306&view=diff
==============================================================================
--- stdcxx/trunk/util/aliases.cpp (original)
+++ stdcxx/trunk/util/aliases.cpp Tue Feb 19 17:35:15 2008
@@ -22,10 +22,19 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*
- * Copyright 2001-2007 Rogue Wave Software, Inc.
+ * Copyright 2001-2008 Rogue Wave Software, Inc.
*
**************************************************************************/
+#include <rw/_defs.h>
+
+#ifdef _RWSTD_EDG_ECCP
+ // disable error #450-D: the type "long long" is nonstandard
+ // issued for uses of the type in Linux system headers (e.g.,
+ // pthreadtypes.h)
+# pragma diag_suppress 450
+#endif // vanilla EDG eccp demo
+
#ifdef __linux__
// on Linux define _XOPEN_SOURCE to get CODESET defined in <langinfo.h>
# define _XOPEN_SOURCE 500 /* SUS conformance */
@@ -33,8 +42,6 @@
#endif // __linux__
#include "diagnostic.h"
-
-#include <rw/_defs.h>
#include <cassert> // for assert()
#include <cerrno> // for errno
Modified: stdcxx/trunk/util/locale.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/locale.cpp?rev=629306&r1=629305&r2=629306&view=diff
==============================================================================
--- stdcxx/trunk/util/locale.cpp (original)
+++ stdcxx/trunk/util/locale.cpp Tue Feb 19 17:35:15 2008
@@ -26,12 +26,20 @@
*
**************************************************************************/
+#include <rw/_defs.h>
+
#if defined (__linux__) && !defined (_XOPEN_SOURCE)
// on Linux define _XOPEN_SOURCE to get CODESET defined in <langinfo.h>
# define _XOPEN_SOURCE 500 /* Single UNIX conformance */
#endif // __linux__
-#include <rw/_defs.h>
+#ifdef _RWSTD_EDG_ECCP
+ // disable error #450-D: the type "long long" is nonstandard
+ // issued for uses of the type in Linux system headers (e.g.,
+ // pthreadtypes.h)
+# pragma diag_suppress 450
+#endif // vanilla EDG eccp demo
+
#include _RWSTD_SYS_TYPES_H
#if _RWSTD_PATH_SEP == '/'
Modified: stdcxx/trunk/util/memchk.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/memchk.cpp?rev=629306&r1=629305&r2=629306&view=diff
==============================================================================
--- stdcxx/trunk/util/memchk.cpp (original)
+++ stdcxx/trunk/util/memchk.cpp Tue Feb 19 17:35:15 2008
@@ -22,7 +22,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*
- * Copyright 2001-2006 Rogue Wave Software.
+ * Copyright 2001-2008 Rogue Wave Software, Inc.
*
**************************************************************************/
@@ -66,6 +66,17 @@
# define P_tmpdir _P_tmpdir
# endif
#endif // P_tmpdir
+
+
+#if defined (_RWSTD_EDG_ECCP) && !defined (_WIN32)
+
+extern "C" {
+
+int getpagesize ();
+
+} // extern "C"
+
+#endif // vanilla EDG eccp demo on UNIX
static int page_size ()