Changeset 7ae06b9 in tol

Timestamp:

May 27, 2009, 8:58:39 AM (17 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

ad1e0d0

Parents:

c89d970

Message:

Jamroot: 2.0.1

GCC 4.3 related changes

cblas_xerbla prototype conflict with the one installed in key15, char * arguments should be const

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1028 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol

Files:

• Jamroot (modified) (1 diff)
• bmath/blinalg/tol_blas.cpp (modified) (1 diff)
• bmath/blinalg/tol_blas.h (modified) (1 diff)
• btol/matrix_type/tol_mat.hpp (modified) (1 diff)
• tol_bcommon.h (modified) (1 diff)

tol/Jamroot

@@ -42 +42 @@
 #
 
-constant TOL_VERSION : 1.1.7 ;
+constant TOL_VERSION : 2.0.1 ;
 
 # Configure a feature hash_map which can take the following values:

tol/bmath/blinalg/tol_blas.cpp

@@ -34 +34 @@
 #define cb2dMat(M) ((const BMatrix<double>&)(M))
 
-void cblas_xerbla(int p, char *rout, char *form, ...)
+void cblas_xerbla(int p, const char *rout, const char *form, ...)
 {
 char buffer[1024];

tol/bmath/blinalg/tol_blas.h

@@ -33 +33 @@
 
 extern "C" {
-  void cblas_xerbla(int p, char *rout, char *form, ...);
+  void cblas_xerbla(int p, const char *rout, const char *form, ...);
 }
 

tol/btol/matrix_type/tol_mat.hpp

@@ -23 +23 @@
 #if HAVE_VALUES_H
 # include <values.h>
+#endif
+
+#if GCC_VERSION >= 40300
+#include <limits>
 #endif
 

tol/tol_bcommon.h

@@ -25 +25 @@
 #if HAVE_CONFIG_H
 #  include <tol/config.h>
+#endif
+
+/* Test for GCC > 4.3.0
+   
+   #if GCC_VERSION > 40300
+*/
+#ifdef __GNUC__
+#define GCC_VERSION (__GNUC__ * 10000 \
+                               + __GNUC_MINOR__ * 100 \
+                               + __GNUC_PATCHLEVEL__)
+#else
+#define GCC_VERSION 0
 #endif