]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: Get it right with extern "C"
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 26 Feb 2013 17:05:02 +0000 (17:05 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 26 Feb 2013 17:05:02 +0000 (17:05 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@28582 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/bundled/umfpack/UMFPACK/Source/cholmod_blas.h
deal.II/source/lac/sparse_direct.cc

index 709f2d0132766800f598862d45115000c057f43f..303769054c81e7af8560f5935e3e32e9e6b2316a 100644 (file)
@@ -16,6 +16,8 @@
 #ifndef CHOLMOD_BLAS_H
 #define CHOLMOD_BLAS_H
 
+extern "C" {
+
 /* ========================================================================== */
 /* === Architecture ========================================================= */
 /* ========================================================================== */
@@ -448,4 +450,6 @@ void BLAS_ZGERU (BLAS_INT *m, BLAS_INT *n, double *alpha,
     } \
 }
 
+} /*extern "C"*/
+
 #endif
index 9e24e31b8a256c0d48e9100117d7cb59e30c1476..7043349a5e834cae06b60b1ab8886ec614800f5e 100644 (file)
@@ -37,9 +37,7 @@ DEAL_II_NAMESPACE_OPEN
 
 // include UMFPACK file.
 #ifdef HAVE_LIBUMFPACK
-extern "C" {
 #  include <umfpack.h>
-}
 #endif
 
 // if the HSL functions are not there, define them empty and throw an

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.