Skip to content

Commit

Permalink
Relaks sparse13
Browse files Browse the repository at this point in the history
  • Loading branch information
alkino committed Jun 16, 2023
1 parent 510b87f commit 4aa5393
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/sparse13/cspmatrix.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define cmplx_spPrefix
#include <sparse13/spmatrix.h>
#include "spmatrix.h"
6 changes: 3 additions & 3 deletions src/sparse13/spalloc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ static char RCSid[] = "@(#)$Header$";
*/

#define spINSIDE_SPARSE
#include <sparse13/spconfig.h>
#include <sparse13/spdefs.h>
#include <sparse13/spmatrix.h>
#include "spconfig.h"
#include "spdefs.h"
#include "spmatrix.h"

/* avoid "declared implicitly `extern' and later `static' " warnings. */
static void InitializeElementBlocks(MatrixPtr Matrix, int InitialNumberOfElements, int NumberOfFillinsExpected);
Expand Down
6 changes: 3 additions & 3 deletions src/sparse13/spbuild.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ static char RCSid[] = "@(#)$Header$";
*/

#define spINSIDE_SPARSE
#include <sparse13/spconfig.h>
#include <sparse13/spdefs.h>
#include <sparse13/spmatrix.h>
#include "spconfig.h"
#include "spdefs.h"
#include "spmatrix.h"

/* avoid "declared implicitly `extern' and later `static' " warnings. */

Expand Down
2 changes: 1 addition & 1 deletion src/sparse13/spconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#define spCONFIG_DEFS

#if defined(cmplx_spPrefix)
#include <sparse13/cspredef.h>
#include "cspredef.h"
#endif

#ifdef spINSIDE_SPARSE
Expand Down
2 changes: 1 addition & 1 deletion src/sparse13/spdefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
* MEMORY ALLOCATION
*/
#if 1
#include <sparse13/spmatrix.h>
#include "spmatrix.h"
#include <stdlib.h>
#else
#if !defined(__MWERKS__)
Expand Down
6 changes: 3 additions & 3 deletions src/sparse13/spfactor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ static char RCSid[] = "@(#)$Header$";
*/

#define spINSIDE_SPARSE
#include <sparse13/spconfig.h>
#include <sparse13/spdefs.h>
#include <sparse13/spmatrix.h>
#include "spconfig.h"
#include "spdefs.h"
#include "spmatrix.h"

/* avoid "declared implicitly `extern' and later `static' " warnings. */
static int FactorComplexMatrix(MatrixPtr Matrix);
Expand Down
2 changes: 1 addition & 1 deletion src/sparse13/spmatrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* spConfig.h
* Macros that customize the sparse matrix routines.
*/
#include <sparse13/spconfig.h>
#include "spconfig.h"
#include <optional>

/*
Expand Down
6 changes: 3 additions & 3 deletions src/sparse13/spoutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ static char RCSid[] = "$Header$";
*/

#define spINSIDE_SPARSE
#include <sparse13/spconfig.h>
#include <sparse13/spdefs.h>
#include <sparse13/spmatrix.h>
#include "spconfig.h"
#include "spdefs.h"
#include "spmatrix.h"

#if DOCUMENTATION

Expand Down
6 changes: 3 additions & 3 deletions src/sparse13/spsolve.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ static char RCSid[] = "@(#)$Header$";
*/

#define spINSIDE_SPARSE
#include <sparse13/spconfig.h>
#include <sparse13/spdefs.h>
#include <sparse13/spmatrix.h>
#include "spconfig.h"
#include "spdefs.h"
#include "spmatrix.h"

/* avoid "declared implicitly `extern' and later `static' " warnings. */
static void SolveComplexMatrix(MatrixPtr Matrix, RealVector RHS, RealVector Solution, std::optional<RealVector> iRHS = std::nullopt, std::optional<RealVector> iSolution = std::nullopt);
Expand Down
6 changes: 3 additions & 3 deletions src/sparse13/sputils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ static char RCSid[] = "@(#)$Header$";
*/

#define spINSIDE_SPARSE
#include <sparse13/spconfig.h>
#include <sparse13/spdefs.h>
#include <sparse13/spmatrix.h>
#include "spconfig.h"
#include "spdefs.h"
#include "spmatrix.h"

extern void spcLinkRows(MatrixPtr);
extern void spcRowExchange(MatrixPtr, int row1, int row2);
Expand Down

0 comments on commit 4aa5393

Please sign in to comment.