Mercurial > hg > octave-avbm
changeset 382:e02d6b664394
[project @ 1994-03-09 21:08:03 by jwe]
author | jwe |
---|---|
date | Wed, 09 Mar 1994 21:08:03 +0000 |
parents | 3dc943e34d9a |
children | 0b52c68ec81f |
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/MArray.h liboctave/Matrix.h liboctave/NLConst.h liboctave/NLEqn.h liboctave/NLFunc.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 liboctave/Range.h liboctave/f77-fcn.h liboctave/lo-error.h liboctave/mx-kludge.h liboctave/sun-utils.h |
diffstat | 29 files changed, 202 insertions(+), 78 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.h +++ b/liboctave/Array.h @@ -21,8 +21,10 @@ */ -#if !defined (_Array_h) -#define _Array_h 1 +#if !defined (octave_Array_h) +#define octave_Array_h 1 + +extern "C++" { #include "lo-error.h" @@ -358,6 +360,8 @@ #include "Array.cc" #endif +} // extern "C++" + #endif /*
--- a/liboctave/Bounds.h +++ b/liboctave/Bounds.h @@ -1,7 +1,7 @@ // Bounds.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_Bounds_h) -#define _Bounds_h 1 +#if !defined (octave_Bounds_h) +#define octave_Bounds_h 1 + +extern "C++" { class ostream; @@ -82,6 +84,8 @@ }; +} // extern "C++" + #endif /*
--- a/liboctave/CollocWt.h +++ b/liboctave/CollocWt.h @@ -1,7 +1,7 @@ // CollocWt.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_CollocWt_h) -#define _CollocWt_h 1 +#if !defined (octave_CollocWt_h) +#define octave_CollocWt_h 1 + +extern "C++" { class ostream; @@ -138,6 +140,8 @@ inline Matrix CollocWt::second (void) { if (!initialized) init (); return B; } +} // extern "C++" + #endif /*
--- a/liboctave/DAE.h +++ b/liboctave/DAE.h @@ -21,8 +21,10 @@ */ -#if !defined (_DAE_h) -#define _DAE_h 1 +#if !defined (octave_DAE_h) +#define octave_DAE_h 1 + +extern "C++" { #include "ODE.h" #include "DAEFunc.h" @@ -85,4 +87,13 @@ }; +} // extern "C++" + #endif + +/* +;;; Local Variables: *** +;;; mode: C++ *** +;;; page-delimiter: "^/\\*" *** +;;; End: *** +*/
--- a/liboctave/DAEFunc.h +++ b/liboctave/DAEFunc.h @@ -1,7 +1,7 @@ // DAEFunc.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_DAEFunc_h) -#define _DAEFunc_h 1 +#if !defined (octave_DAEFunc_h) +#define octave_DAEFunc_h 1 + +extern "C++" { #include "Matrix.h" @@ -71,4 +73,13 @@ DAEJacFunc jac; }; +} // extern "C++" + #endif + +/* +;;; Local Variables: *** +;;; mode: C++ *** +;;; page-delimiter: "^/\\*" *** +;;; End: *** +*/
--- a/liboctave/FEGrid.h +++ b/liboctave/FEGrid.h @@ -1,7 +1,7 @@ // FEGrid.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_FEGrid_h) -#define _FEGrid_h 1 +#if !defined (octave_FEGrid_h) +#define octave_FEGrid_h 1 + +extern "C++" { class ostream; @@ -81,6 +83,8 @@ inline Vector FEGrid::element_boundaries (void) const { return elem; } +} // extern "C++" + #endif /*
--- a/liboctave/FSQP.h +++ b/liboctave/FSQP.h @@ -1,7 +1,7 @@ // FSQP.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_FSQP_h) -#define _FSQP_h 1 +#if !defined (octave_FSQP_h) +#define octave_FSQP_h 1 + +extern "C++" { #ifndef FSQP_MISSING @@ -41,6 +43,8 @@ #endif /* FSQP_MISSING */ +} // extern "C++" + #endif /*
--- a/liboctave/LP.h +++ b/liboctave/LP.h @@ -1,7 +1,7 @@ // LP.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_LP_h) -#define _LP_h 1 +#if !defined (octave_LP_h) +#define octave_LP_h 1 + +extern "C++" { #include "Matrix.h" #include "Bounds.h" @@ -54,6 +56,8 @@ LinConst lc; }; +} // extern "C++" + #endif /*
--- a/liboctave/LPsolve.h +++ b/liboctave/LPsolve.h @@ -1,7 +1,7 @@ // LPsolve.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_LPsolve_h) -#define _LPsolve_h 1 +#if !defined (octave_LPsolve_h) +#define octave_LPsolve_h 1 + +extern "C++" { #include "Matrix.h" #include "LP.h" @@ -57,6 +59,8 @@ void set_default_options (void); }; +} // extern "C++" + #endif /*
--- a/liboctave/LinConst.h +++ b/liboctave/LinConst.h @@ -1,7 +1,7 @@ // LinConst.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_LinConst_h) -#define _LinConst_h 1 +#if !defined (octave_LinConst_h) +#define octave_LinConst_h 1 + +extern "C++" { #include <float.h> @@ -123,6 +125,8 @@ return *this; } +} // extern "C++" + #endif /*
--- a/liboctave/MArray.h +++ b/liboctave/MArray.h @@ -1,7 +1,7 @@ // Template array classes with like-type math ops -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_MArray_h) -#define _MArray_h 1 +#if !defined (octave_MArray_h) +#define octave_MArray_h 1 + +extern "C++" { #include "Array.h" @@ -203,6 +205,8 @@ #include "MArray.cc" #endif +} // extern "C++" + #endif /*
--- a/liboctave/Matrix.h +++ b/liboctave/Matrix.h @@ -28,8 +28,10 @@ */ -#if !defined (_Matrix_h) -#define _Matrix_h 1 +#if !defined (octave_Matrix_h) +#define octave_Matrix_h 1 + +extern "C++" { #include <stdlib.h> #include <stddef.h> @@ -2449,6 +2451,8 @@ return r; } +} // extern "C++" + #endif /*
--- a/liboctave/NLConst.h +++ b/liboctave/NLConst.h @@ -1,7 +1,7 @@ // NLConst.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_NLConst_h) -#define _NLConst_h 1 +#if !defined (octave_NLConst_h) +#define octave_NLConst_h 1 + +extern "C++" { #include "Matrix.h" #include "Bounds.h" @@ -49,6 +51,8 @@ }; +} // extern "C++" + #endif /*
--- a/liboctave/NLEqn.h +++ b/liboctave/NLEqn.h @@ -21,8 +21,10 @@ */ -#if !defined (_NLEqn_h) -#define _NLEqn_h 1 +#if !defined (octave_NLEqn_h) +#define octave_NLEqn_h 1 + +extern "C++" { #include "Matrix.h" #include "NLFunc.h" @@ -89,6 +91,8 @@ void error (const char* msg); }; +} // extern "C++" + #endif /*
--- a/liboctave/NLFunc.h +++ b/liboctave/NLFunc.h @@ -1,7 +1,7 @@ // NLFunc.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_NLFunc_h) -#define _NLFunc_h 1 +#if !defined (octave_NLFunc_h) +#define octave_NLFunc_h 1 + +extern "C++" { #include "Matrix.h" @@ -59,6 +61,8 @@ jacobian_fcn jac; }; +} // extern "C++" + #endif /*
--- a/liboctave/NLP.h +++ b/liboctave/NLP.h @@ -21,8 +21,10 @@ */ -#if !defined (_NLP_h) -#define _NLP_h 1 +#if !defined (octave_NLP_h) +#define octave_NLP_h 1 + +extern "C++" { #include "Matrix.h" #include "Objective.h" @@ -128,6 +130,8 @@ return x.capacity (); } +} // extern "C++" + #endif /*
--- a/liboctave/NPSOL.h +++ b/liboctave/NPSOL.h @@ -21,8 +21,10 @@ */ -#if !defined (_NPSOL_h) -#define _NPSOL_h 1 +#if !defined (octave_NPSOL_h) +#define octave_NPSOL_h 1 + +extern "C++" { #ifndef NPSOL_MISSING @@ -188,6 +190,8 @@ #endif /* NPSOL_MISSING */ +} // extern "C++" + #endif /*
--- a/liboctave/ODE.h +++ b/liboctave/ODE.h @@ -21,8 +21,10 @@ */ -#if !defined (_ODE_h) -#define _ODE_h 1 +#if !defined (octave_ODE_h) +#define octave_ODE_h 1 + +extern "C++" { class ostream; @@ -129,6 +131,8 @@ }; +} // extern "C++" + #endif /*
--- a/liboctave/ODEFunc.h +++ b/liboctave/ODEFunc.h @@ -1,7 +1,7 @@ // ODEFunc.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_ODEFunc_h) -#define _ODEFunc_h 1 +#if !defined (octave_ODEFunc_h) +#define octave_ODEFunc_h 1 + +extern "C++" { #include "Matrix.h" @@ -63,9 +65,9 @@ ODERHSFunc fun; ODEJacFunc jac; +}; -private: -}; +} // extern "C++" #endif
--- a/liboctave/Objective.h +++ b/liboctave/Objective.h @@ -1,7 +1,7 @@ // Objective.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_Objective_h) -#define _Objective_h 1 +#if !defined (octave_Objective_h) +#define octave_Objective_h 1 + +extern "C++" { #include "Matrix.h" @@ -60,6 +62,8 @@ }; +} // extern "C++" + #endif /*
--- a/liboctave/QLD.h +++ b/liboctave/QLD.h @@ -1,7 +1,7 @@ // QLD.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_QLD_h) -#define _QLD_h 1 +#if !defined (octave_QLD_h) +#define octave_QLD_h 1 + +extern "C++" { #include "Matrix.h" #include "QP.h" @@ -89,6 +91,8 @@ return *this; } +} // extern "C++" + #endif /*
--- a/liboctave/QP.h +++ b/liboctave/QP.h @@ -1,7 +1,7 @@ // QP.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_QP_h) -#define _QP_h 1 +#if !defined (octave_QP_h) +#define octave_QP_h 1 + +extern "C++" { #include "Matrix.h" #include "Bounds.h" @@ -71,6 +73,8 @@ Matrix make_h_symmetric (void); }; +} // extern "C++" + #endif /*
--- a/liboctave/QPSOL.h +++ b/liboctave/QPSOL.h @@ -21,8 +21,10 @@ */ -#if !defined (_QPSOL_h) -#define _QPSOL_h 1 +#if !defined (octave_QPSOL_h) +#define octave_QPSOL_h 1 + +extern "C++" { #ifndef QPSOL_MISSING @@ -122,6 +124,8 @@ #endif /* QPSOL_MISSING */ +} // extern "C++" + #endif /*
--- a/liboctave/Quad.h +++ b/liboctave/Quad.h @@ -21,8 +21,10 @@ */ -#if !defined (_Quad_h) -#define _Quad_h 1 +#if !defined (octave_Quad_h) +#define octave_Quad_h 1 + +extern "C++" { #include "Matrix.h" @@ -132,6 +134,8 @@ IntegralType type; }; +} // extern "C++" + #endif /*
--- a/liboctave/Range.h +++ b/liboctave/Range.h @@ -1,7 +1,7 @@ // Range.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_Range_h) -#define _Range_h 1 +#if !defined (octave_Range_h) +#define octave_Range_h 1 + +extern "C++" { class istream; class ostream; @@ -108,6 +110,8 @@ inline void Range::set_limit (double l) { rng_limit = l; } inline void Range::set_inc (double i) { rng_inc = i; } +} // extern "C++" + #endif /*
--- a/liboctave/f77-fcn.h +++ b/liboctave/f77-fcn.h @@ -1,7 +1,7 @@ // f77-uscore.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,8 @@ */ -#if !defined (_f77_uscore_h) -#define _f77_uscore_h 1 +#if !defined (octave_f77_uscore_h) +#define octave_f77_uscore_h 1 #if defined (F77_APPEND_UNDERSCORE) #define F77_FCN(f) f##_
--- a/liboctave/lo-error.h +++ b/liboctave/lo-error.h @@ -1,7 +1,7 @@ // error.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_liboctave_error_h) -#define _liboctave_error_h 1 +#if !defined (octave_liboctave_error_h) +#define octave_liboctave_error_h 1 + +extern "C++" { // Tell g++ that fatal doesn't return; @@ -41,6 +43,8 @@ extern void set_liboctave_error_handler (liboctave_error_handler f); +} // extern "C++" + #endif /*
--- a/liboctave/mx-kludge.h +++ b/liboctave/mx-kludge.h @@ -1,7 +1,7 @@ // kludge.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -30,6 +30,8 @@ // When templates work more reliably in g++, this will be replaced by // the MArray class. +extern "C++" { + #ifdef KLUDGE_VECTORS /* @@ -131,6 +133,8 @@ #undef DO_VV_OP #undef NEG_V +} // extern "C++" + /* ;;; Local Variables: *** ;;; mode: C++ ***
--- a/liboctave/sun-utils.h +++ b/liboctave/sun-utils.h @@ -1,7 +1,7 @@ // sun-utils.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,10 @@ */ -#if !defined (_sun_utils_h) -#define _sun_utils_h 1 +#if !defined (octave_sun_utils_h) +#define octave_sun_utils_h 1 + +extern "C++" { #ifdef sun @@ -77,6 +79,8 @@ #endif +} // extern "C++" + /* ;;; Local Variables: *** ;;; mode: C++ ***