Mercurial > hg > octave-avbm
changeset 384:7e870a4ec9bc
[project @ 1994-03-09 21:40:04 by jwe]
author | jwe |
---|---|
date | Wed, 09 Mar 1994 21:46:32 +0000 |
parents | 0b52c68ec81f |
children | 31756232e2b7 |
files | liboctave/Array.h liboctave/Bounds.h liboctave/CollocWt.h liboctave/DAE.h liboctave/DAEFunc.h liboctave/FEGrid.h liboctave/FSQP.h liboctave/LP.h liboctave/LPsolve.h liboctave/LinConst.h liboctave/Matrix.h liboctave/NLConst.h liboctave/NLEqn.h liboctave/NLP.h liboctave/NPSOL.h liboctave/ODE.h liboctave/ODEFunc.h liboctave/Objective.h liboctave/QLD.h liboctave/QP.h liboctave/QPSOL.h liboctave/Quad.h |
diffstat | 22 files changed, 48 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.h +++ b/liboctave/Array.h @@ -24,9 +24,9 @@ #if !defined (octave_Array_h) #define octave_Array_h 1 -extern "C++" { +#include "lo-error.h" -#include "lo-error.h" +extern "C++" { #if defined (__GNUG__) && defined (USE_EXTERNAL_TEMPLATES) #pragma interface
--- a/liboctave/Bounds.h +++ b/liboctave/Bounds.h @@ -24,12 +24,12 @@ #if !defined (octave_Bounds_h) #define octave_Bounds_h 1 +#include "Matrix.h" + extern "C++" { class ostream; -#include "Matrix.h" - #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/CollocWt.h +++ b/liboctave/CollocWt.h @@ -24,12 +24,12 @@ #if !defined (octave_CollocWt_h) #define octave_CollocWt_h 1 +#include "Matrix.h" + extern "C++" { class ostream; -#include "Matrix.h" - #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/DAE.h +++ b/liboctave/DAE.h @@ -24,12 +24,12 @@ #if !defined (octave_DAE_h) #define octave_DAE_h 1 -extern "C++" { - #include "ODE.h" #include "DAEFunc.h" #include "Matrix.h" +extern "C++" { + #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/DAEFunc.h +++ b/liboctave/DAEFunc.h @@ -24,16 +24,16 @@ #if !defined (octave_DAEFunc_h) #define octave_DAEFunc_h 1 -extern "C++" { +#include "Matrix.h" -#include "Matrix.h" +extern "C++" { #ifndef Vector #define Vector ColumnVector #endif -#ifndef _DAEFunc_typedefs -#define _DAEFunc_typedefs 1 +#if !defined (octave_DAEFunc_typedefs) +#define octave_DAEFunc_typedefs 1 typedef struct DAEJac {
--- a/liboctave/FEGrid.h +++ b/liboctave/FEGrid.h @@ -24,12 +24,12 @@ #if !defined (octave_FEGrid_h) #define octave_FEGrid_h 1 +#include "Matrix.h" + extern "C++" { class ostream; -#include "Matrix.h" - #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/FSQP.h +++ b/liboctave/FSQP.h @@ -24,13 +24,13 @@ #if !defined (octave_FSQP_h) #define octave_FSQP_h 1 -extern "C++" { - #ifndef FSQP_MISSING #include "Matrix.h" #include "NLP.h" +extern "C++" { + #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/LP.h +++ b/liboctave/LP.h @@ -24,12 +24,12 @@ #if !defined (octave_LP_h) #define octave_LP_h 1 -extern "C++" { - #include "Matrix.h" #include "Bounds.h" #include "LinConst.h" +extern "C++" { + #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/LPsolve.h +++ b/liboctave/LPsolve.h @@ -24,11 +24,11 @@ #if !defined (octave_LPsolve_h) #define octave_LPsolve_h 1 -extern "C++" { - #include "Matrix.h" #include "LP.h" +extern "C++" { + #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/LinConst.h +++ b/liboctave/LinConst.h @@ -24,9 +24,9 @@ #if !defined (octave_LinConst_h) #define octave_LinConst_h 1 -extern "C++" { +#include <float.h> -#include <float.h> +extern "C++" { class ostream;
--- a/liboctave/Matrix.h +++ b/liboctave/Matrix.h @@ -31,8 +31,6 @@ #if !defined (octave_Matrix_h) #define octave_Matrix_h 1 -extern "C++" { - #include <stdlib.h> #include <stddef.h> #include <math.h> @@ -41,6 +39,8 @@ // #include <iomanip.h> // We don\'t use this yet. #include <Complex.h> +extern "C++" { + class ostream; class istream;
--- a/liboctave/NLConst.h +++ b/liboctave/NLConst.h @@ -24,12 +24,12 @@ #if !defined (octave_NLConst_h) #define octave_NLConst_h 1 -extern "C++" { - #include "Matrix.h" #include "Bounds.h" #include "NLFunc.h" +extern "C++" { + #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/NLEqn.h +++ b/liboctave/NLEqn.h @@ -24,11 +24,11 @@ #if !defined (octave_NLEqn_h) #define octave_NLEqn_h 1 -extern "C++" { - #include "Matrix.h" #include "NLFunc.h" +extern "C++" { + #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/NLP.h +++ b/liboctave/NLP.h @@ -24,14 +24,14 @@ #if !defined (octave_NLP_h) #define octave_NLP_h 1 -extern "C++" { - #include "Matrix.h" #include "Objective.h" #include "Bounds.h" #include "LinConst.h" #include "NLConst.h" +extern "C++" { + #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/NPSOL.h +++ b/liboctave/NPSOL.h @@ -24,13 +24,13 @@ #if !defined (octave_NPSOL_h) #define octave_NPSOL_h 1 -extern "C++" { - #ifndef NPSOL_MISSING #include "Matrix.h" #include "NLP.h" +extern "C++" { + #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/ODE.h +++ b/liboctave/ODE.h @@ -24,13 +24,13 @@ #if !defined (octave_ODE_h) #define octave_ODE_h 1 -extern "C++" { - class ostream; #include "Matrix.h" #include "ODEFunc.h" +extern "C++" { + class ODE_options { public:
--- a/liboctave/ODEFunc.h +++ b/liboctave/ODEFunc.h @@ -24,9 +24,9 @@ #if !defined (octave_ODEFunc_h) #define octave_ODEFunc_h 1 -extern "C++" { +#include "Matrix.h" -#include "Matrix.h" +extern "C++" { #ifndef Vector #define Vector ColumnVector
--- a/liboctave/Objective.h +++ b/liboctave/Objective.h @@ -24,9 +24,9 @@ #if !defined (octave_Objective_h) #define octave_Objective_h 1 -extern "C++" { +#include "Matrix.h" -#include "Matrix.h" +extern "C++" { #ifndef Vector #define Vector ColumnVector
--- a/liboctave/QLD.h +++ b/liboctave/QLD.h @@ -24,11 +24,11 @@ #if !defined (octave_QLD_h) #define octave_QLD_h 1 -extern "C++" { - #include "Matrix.h" #include "QP.h" +extern "C++" { + #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/QP.h +++ b/liboctave/QP.h @@ -24,12 +24,12 @@ #if !defined (octave_QP_h) #define octave_QP_h 1 -extern "C++" { - #include "Matrix.h" #include "Bounds.h" #include "LinConst.h" +extern "C++" { + #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/QPSOL.h +++ b/liboctave/QPSOL.h @@ -24,13 +24,13 @@ #if !defined (octave_QPSOL_h) #define octave_QPSOL_h 1 -extern "C++" { - #ifndef QPSOL_MISSING #include "Matrix.h" #include "QP.h" +extern "C++" { + #ifndef Vector #define Vector ColumnVector #endif
--- a/liboctave/Quad.h +++ b/liboctave/Quad.h @@ -24,16 +24,16 @@ #if !defined (octave_Quad_h) #define octave_Quad_h 1 -extern "C++" { +#include "Matrix.h" -#include "Matrix.h" +extern "C++" { #ifndef Vector #define Vector ColumnVector #endif -#ifndef _Quad_typedefs -#define _Quad_typedefs 1 +#if !defined (octave_Quad_typedefs) +#define octave_Quad_typedefs 1 typedef double (*integrand_fcn) (double x);