Mercurial > hg > octave-nkf
changeset 17822:ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
* libgui/src/dialog.h, libgui/src/find-files-dialog.h,
libgui/src/find-files-model.h, libgui/src/m-editor/file-editor-tab.h,
libgui/src/m-editor/octave-qscintilla.h, libgui/src/main-window.h,
libgui/src/octave-dock-widget.h, libgui/src/workspace-model.h,
libgui/src/workspace-view.h, libinterp/corefcn/Cell.h,
libinterp/corefcn/gl-render.h, libinterp/corefcn/gl2ps-renderer.h,
libinterp/corefcn/graphics.in.h, libinterp/corefcn/oct-errno.h,
libinterp/corefcn/oct-fstrm.h, libinterp/corefcn/oct-handle.h,
libinterp/corefcn/oct-hdf5.h, libinterp/corefcn/oct-hist.h,
libinterp/corefcn/oct-iostrm.h, libinterp/corefcn/oct-lvalue.h,
libinterp/corefcn/oct-prcstrm.h, libinterp/corefcn/oct-procbuf.h,
libinterp/corefcn/oct-stdstrm.h, libinterp/corefcn/oct-stream.h,
libinterp/corefcn/oct-strstrm.h, libinterp/corefcn/octave-link.h,
libinterp/corefcn/pt-jit.h, libinterp/octave-value/ov-base-diag.h,
libinterp/octave-value/ov-base-int.h, libinterp/octave-value/ov-base-mat.h,
libinterp/octave-value/ov-base-scalar.h,
libinterp/octave-value/ov-base-sparse.h, libinterp/octave-value/ov-base.h,
libinterp/octave-value/ov-bool-mat.h, libinterp/octave-value/ov-bool-sparse.h,
libinterp/octave-value/ov-bool.h, libinterp/octave-value/ov-builtin.h,
libinterp/octave-value/ov-cell.h, libinterp/octave-value/ov-ch-mat.h,
libinterp/octave-value/ov-class.h, libinterp/octave-value/ov-colon.h,
libinterp/octave-value/ov-complex.h, libinterp/octave-value/ov-cs-list.h,
libinterp/octave-value/ov-cx-diag.h, libinterp/octave-value/ov-cx-mat.h,
libinterp/octave-value/ov-cx-sparse.h, libinterp/octave-value/ov-dld-fcn.h,
libinterp/octave-value/ov-fcn-handle.h, libinterp/octave-value/ov-fcn-inline.h,
libinterp/octave-value/ov-fcn.h, libinterp/octave-value/ov-float.h,
libinterp/octave-value/ov-flt-complex.h,
libinterp/octave-value/ov-flt-cx-diag.h,
libinterp/octave-value/ov-flt-cx-mat.h,
libinterp/octave-value/ov-flt-re-diag.h,
libinterp/octave-value/ov-flt-re-mat.h, libinterp/octave-value/ov-int-traits.h,
libinterp/octave-value/ov-int16.h, libinterp/octave-value/ov-int32.h,
libinterp/octave-value/ov-int64.h, libinterp/octave-value/ov-int8.h,
libinterp/octave-value/ov-java.h, libinterp/octave-value/ov-lazy-idx.h,
libinterp/octave-value/ov-mex-fcn.h, libinterp/octave-value/ov-null-mat.h,
libinterp/octave-value/ov-perm.h, libinterp/octave-value/ov-range.h,
libinterp/octave-value/ov-re-diag.h, libinterp/octave-value/ov-re-mat.h,
libinterp/octave-value/ov-re-sparse.h, libinterp/octave-value/ov-scalar.h,
libinterp/octave-value/ov-str-mat.h, libinterp/octave-value/ov-struct.h,
libinterp/octave-value/ov-typeinfo.h, libinterp/octave-value/ov-uint16.h,
libinterp/octave-value/ov-uint32.h, libinterp/octave-value/ov-uint64.h,
libinterp/octave-value/ov-uint8.h, libinterp/octave-value/ov-usr-fcn.h,
libinterp/octave-value/ov.h, libinterp/parse-tree/pt-all.h,
libinterp/parse-tree/pt-arg-list.h, libinterp/parse-tree/pt-array-list.h,
libinterp/parse-tree/pt-assign.h, libinterp/parse-tree/pt-binop.h,
libinterp/parse-tree/pt-bp.h, libinterp/parse-tree/pt-cbinop.h,
libinterp/parse-tree/pt-cell.h, libinterp/parse-tree/pt-check.h,
libinterp/parse-tree/pt-cmd.h, libinterp/parse-tree/pt-colon.h,
libinterp/parse-tree/pt-const.h, libinterp/parse-tree/pt-decl.h,
libinterp/parse-tree/pt-eval.h, libinterp/parse-tree/pt-except.h,
libinterp/parse-tree/pt-exp.h, libinterp/parse-tree/pt-fcn-handle.h,
libinterp/parse-tree/pt-id.h, libinterp/parse-tree/pt-idx.h,
libinterp/parse-tree/pt-jump.h, libinterp/parse-tree/pt-loop.h,
libinterp/parse-tree/pt-mat.h, libinterp/parse-tree/pt-misc.h,
libinterp/parse-tree/pt-pr-code.h, libinterp/parse-tree/pt-select.h,
libinterp/parse-tree/pt-stmt.h, libinterp/parse-tree/pt-unop.h,
libinterp/parse-tree/pt-walk.h, libinterp/parse-tree/pt.h,
liboctave/array/CColVector.h, liboctave/array/CDiagMatrix.h,
liboctave/array/CMatrix.h, liboctave/array/CNDArray.h,
liboctave/array/CRowVector.h, liboctave/array/boolMatrix.h,
liboctave/array/chMatrix.h, liboctave/array/chNDArray.h,
liboctave/array/dColVector.h, liboctave/array/dDiagMatrix.h,
liboctave/array/dMatrix.h, liboctave/array/dNDArray.h,
liboctave/array/dRowVector.h, liboctave/array/fCColVector.h,
liboctave/array/fCDiagMatrix.h, liboctave/array/fCMatrix.h,
liboctave/array/fCNDArray.h, liboctave/array/fCRowVector.h,
liboctave/array/fColVector.h, liboctave/array/fDiagMatrix.h,
liboctave/array/fMatrix.h, liboctave/array/fNDArray.h,
liboctave/array/fRowVector.h, liboctave/cruft/misc/lo-error.h,
liboctave/numeric/CmplxAEPBAL.h, liboctave/numeric/CmplxCHOL.h,
liboctave/numeric/CmplxGEPBAL.h, liboctave/numeric/CmplxHESS.h,
liboctave/numeric/CmplxLU.h, liboctave/numeric/CmplxQR.h,
liboctave/numeric/CmplxQRP.h, liboctave/numeric/CmplxSCHUR.h,
liboctave/numeric/CmplxSVD.h, liboctave/numeric/Quad.h,
liboctave/numeric/SparseCmplxCHOL.h, liboctave/numeric/SparseCmplxLU.h,
liboctave/numeric/SparseCmplxQR.h, liboctave/numeric/SparseQR.h,
liboctave/numeric/SparsedbleCHOL.h, liboctave/numeric/SparsedbleLU.h,
liboctave/numeric/bsxfun.h, liboctave/numeric/dbleAEPBAL.h,
liboctave/numeric/dbleCHOL.h, liboctave/numeric/dbleGEPBAL.h,
liboctave/numeric/dbleHESS.h, liboctave/numeric/dbleLU.h,
liboctave/numeric/dbleQR.h, liboctave/numeric/dbleQRP.h,
liboctave/numeric/dbleSCHUR.h, liboctave/numeric/dbleSVD.h,
liboctave/numeric/fCmplxAEPBAL.h, liboctave/numeric/fCmplxCHOL.h,
liboctave/numeric/fCmplxGEPBAL.h, liboctave/numeric/fCmplxHESS.h,
liboctave/numeric/fCmplxLU.h, liboctave/numeric/fCmplxQR.h,
liboctave/numeric/fCmplxQRP.h, liboctave/numeric/fCmplxSCHUR.h,
liboctave/numeric/fCmplxSVD.h, liboctave/numeric/fEIG.h,
liboctave/numeric/floatAEPBAL.h, liboctave/numeric/floatCHOL.h,
liboctave/numeric/floatGEPBAL.h, liboctave/numeric/floatHESS.h,
liboctave/numeric/floatLU.h, liboctave/numeric/floatQR.h,
liboctave/numeric/floatQRP.h, liboctave/numeric/floatSCHUR.h,
liboctave/numeric/floatSVD.h, liboctave/numeric/lo-mappers.h,
liboctave/numeric/lo-specfun.h, liboctave/numeric/oct-convn.h,
liboctave/numeric/oct-norm.h, liboctave/numeric/oct-rand.h,
liboctave/operators/Sparse-diag-op-defs.h,
liboctave/operators/Sparse-op-defs.h,
liboctave/operators/Sparse-perm-op-defs.h, liboctave/system/lo-sysdep.h,
liboctave/system/oct-env.h, liboctave/system/oct-group.h,
liboctave/system/oct-openmp.h, liboctave/system/oct-passwd.h,
liboctave/system/oct-syscalls.h, liboctave/system/oct-time.h,
liboctave/system/oct-uname.h, liboctave/util/lo-array-gripes.h,
liboctave/util/lo-cutils.h, liboctave/util/lo-ieee.h,
liboctave/util/lo-macros.h, liboctave/util/lo-math.h,
liboctave/util/lo-regexp.h, liboctave/util/lo-traits.h,
liboctave/util/lo-utils.h, liboctave/util/oct-base64.h,
liboctave/util/oct-binmap.h, liboctave/util/oct-glob.h,
liboctave/util/oct-inttypes.h, liboctave/util/oct-locbuf.h,
liboctave/util/oct-mem.h, liboctave/util/oct-mutex.h,
liboctave/util/oct-refcount.h, liboctave/util/oct-rl-edit.h,
liboctave/util/oct-rl-hist.h, liboctave/util/oct-shlib.h,
liboctave/util/oct-sort.h, liboctave/util/oct-sparse.h:
Use common #define syntax "octave_filename_h" in h_files.
line wrap: on
line diff
--- a/libgui/src/dialog.h +++ b/libgui/src/dialog.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_guifcn_dialog_h) -#define octave_guifcn_dialog_h 1 +#if !defined (octave_dialog_h) +#define octave_dialog_h 1 #include <QMutex> #include <QWaitCondition>
--- a/libgui/src/find-files-dialog.h +++ b/libgui/src/find-files-dialog.h @@ -19,8 +19,8 @@ <http://www.gnu.org/licenses/>. */ -#if !defined (find_files_dialog_h) -#define find_files_dialog_h +#if !defined (octave_find_files_dialog_h) +#define octave_find_files_dialog_h #include <QDialog> #include <QModelIndex> @@ -75,5 +75,5 @@ QStatusBar * _status_bar; }; -#endif // find_files_dialog_h +#endif // octave_find_files_dialog_h
--- a/libgui/src/find-files-model.h +++ b/libgui/src/find-files-model.h @@ -19,8 +19,8 @@ <http://www.gnu.org/licenses/>. */ -#if !defined (find_files_model_h) -#define find_files_model_h +#if !defined (octave_find_files_model_h) +#define octave_find_files_model_h #include <QAbstractListModel> #include <QStringList> @@ -60,5 +60,5 @@ int _sortorder; }; -#endif // find_files_model_h +#endif // octave_find_files_model_h
--- a/libgui/src/m-editor/file-editor-tab.h +++ b/libgui/src/m-editor/file-editor-tab.h @@ -20,8 +20,8 @@ */ -#if !defined (file_editor_tab_h) -#define file_editor_tab_h 1 +#if !defined (octave_file_editor_tab_h) +#define octave_file_editor_tab_h 1 #include <QWidget> #include <QCloseEvent>
--- a/libgui/src/m-editor/octave-qscintilla.h +++ b/libgui/src/m-editor/octave-qscintilla.h @@ -22,8 +22,8 @@ // Author: Torsten <ttl@justmail.de> -#if !defined (octave_qscintilla_h) -#define octave_qscintilla_h 1 +#if !defined (octave_octave_qscintilla_h) +#define octave_octave_qscintilla_h 1 #include <Qsci/qsciscintilla.h> #include <QMenu>
--- a/libgui/src/main-window.h +++ b/libgui/src/main-window.h @@ -21,8 +21,8 @@ */ -#if !defined (main_window_h) -#define main_window_h 1 +#if !defined (octave_main_window_h) +#define octave_main_window_h 1 // Qt includes #include <QtGui/QMainWindow>
--- a/libgui/src/octave-dock-widget.h +++ b/libgui/src/octave-dock-widget.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_dock_widget_h) -#define octave_dock_widget_h 1 +#if !defined (octave_octave_dock_widget_h) +#define octave_octave_dock_widget_h 1 #include <QDockWidget> #include <QSettings>
--- a/libgui/src/workspace-model.h +++ b/libgui/src/workspace-model.h @@ -21,8 +21,8 @@ */ -#if !defined (workspace_model_h) -#define workspace_model_h 1 +#if !defined (octave_workspace_model_h) +#define octave_workspace_model_h 1 #include <QAbstractTableModel> #include <QVector>
--- a/libgui/src/workspace-view.h +++ b/libgui/src/workspace-view.h @@ -21,8 +21,8 @@ */ -#if !defined (workspace_view_h) -#define workspace_view_h 1 +#if !defined (octave_workspace_view_h) +#define octave_workspace_view_h 1 #include <QItemDelegate> #include <QTableView>
--- a/libinterp/corefcn/Cell.h +++ b/libinterp/corefcn/Cell.h @@ -21,8 +21,8 @@ */ -#if !defined (Cell_h) -#define Cell_h 1 +#if !defined (octave_Cell_h) +#define octave_Cell_h 1 #include <string>
--- a/libinterp/corefcn/gl-render.h +++ b/libinterp/corefcn/gl-render.h @@ -20,8 +20,8 @@ */ -#if !defined (gl_render_h) -#define gl_render_h 1 +#if !defined (octave_gl_render_h) +#define octave_gl_render_h 1 #ifdef HAVE_WINDOWS_H #define WIN32_LEAN_AND_MEAN
--- a/libinterp/corefcn/gl2ps-renderer.h +++ b/libinterp/corefcn/gl2ps-renderer.h @@ -20,8 +20,8 @@ */ -#if !defined (gl2ps_renderer_h) -#define gl2ps_renderer_h 1 +#if !defined (octave_gl2ps_renderer_h) +#define octave_gl2ps_renderer_h 1 #ifdef HAVE_GL2PS_H
--- a/libinterp/corefcn/graphics.in.h +++ b/libinterp/corefcn/graphics.in.h @@ -20,8 +20,8 @@ */ -#if !defined (graphics_h) -#define graphics_h 1 +#if !defined (octave_graphics_h) +#define octave_graphics_h 1 #ifdef HAVE_CONFIG_H #include <config.h>
--- a/libinterp/corefcn/oct-errno.h +++ b/libinterp/corefcn/oct-errno.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_errno_h) -#define octave_errno_h 1 +#if !defined (octave_oct_errno_h) +#define octave_oct_errno_h 1 #include <cerrno> #include <map>
--- a/libinterp/corefcn/oct-fstrm.h +++ b/libinterp/corefcn/oct-fstrm.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_octave_fstream_h) -#define octave_octave_fstream_h 1 +#if !defined (octave_oct_fstrm_h) +#define octave_oct_fstrm_h 1 #include <fstream> #include <string>
--- a/libinterp/corefcn/oct-handle.h +++ b/libinterp/corefcn/oct-handle.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_handle_h) -#define octave_handle_h 1 +#if !defined (octave_oct_handle_h) +#define octave_oct_handle_h 1 #include "dMatrix.h" #include "lo-ieee.h"
--- a/libinterp/corefcn/oct-hdf5.h +++ b/libinterp/corefcn/oct-hdf5.h @@ -20,7 +20,7 @@ */ -#if !defined (octave__hdf5_h) +#if !defined (octave_oct_hdf5_h) #define octave_hdf5_h 1 #if defined (HAVE_HDF5)
--- a/libinterp/corefcn/oct-hist.h +++ b/libinterp/corefcn/oct-hist.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_octave_hist_h) -#define octave_octave_hist_h 1 +#if !defined (octave_oct_hist_h) +#define octave_oct_hist_h 1 #include <string>
--- a/libinterp/corefcn/oct-iostrm.h +++ b/libinterp/corefcn/oct-iostrm.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_octave_iostream_h) -#define octave_octave_iostream_h 1 +#if !defined (octave_oct_iostrm_h) +#define octave_oct_iostrm_h 1 #include <iosfwd>
--- a/libinterp/corefcn/oct-lvalue.h +++ b/libinterp/corefcn/oct-lvalue.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_lvalue_h) -#define octave_lvalue_h 1 +#if !defined (octave_oct_lvalue_h) +#define octave_oct_lvalue_h 1 class octave_value; class octave_value_list;
--- a/libinterp/corefcn/oct-prcstrm.h +++ b/libinterp/corefcn/oct-prcstrm.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_octave_procstream_h) -#define octave_octave_procstream_h 1 +#if !defined (octave_oct_prcstrm_h) +#define octave_oct_prcstrm_h 1 #include "oct-stdstrm.h"
--- a/libinterp/corefcn/oct-procbuf.h +++ b/libinterp/corefcn/oct-procbuf.h @@ -23,8 +23,8 @@ // This class is based on the procbuf class from libg++, written by // Per Bothner, Copyright (C) 1993 Free Software Foundation. -#if !defined (octave_octave_procbuf_h) -#define octave_octave_procbuf_h 1 +#if !defined (octave_oct_procbuf_h) +#define octave_oct_procbuf_h 1 #include <sys/types.h>
--- a/libinterp/corefcn/oct-stdstrm.h +++ b/libinterp/corefcn/oct-stdstrm.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_octave_stdiostream_h) -#define octave_octave_stdiostream_h 1 +#if !defined (octave_oct_stdstrm_h) +#define octave_oct_stdstrm_h 1 #include "oct-stream.h" #include "c-file-ptr-stream.h"
--- a/libinterp/corefcn/oct-stream.h +++ b/libinterp/corefcn/oct-stream.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_octave_stream_h) -#define octave_octave_stream_h 1 +#if !defined (octave_oct_stream_h) +#define octave_oct_stream_h 1 class Matrix; class string_vector;
--- a/libinterp/corefcn/oct-strstrm.h +++ b/libinterp/corefcn/oct-strstrm.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_octave_strstream_h) -#define octave_octave_strstream_h 1 +#if !defined (octave_oct_strstrm_h) +#define octave_oct_strstrm_h 1 #include <string> #include <sstream>
--- a/libinterp/corefcn/octave-link.h +++ b/libinterp/corefcn/octave-link.h @@ -22,8 +22,8 @@ */ -#if !defined (octave_link_h) -#define octave_link_h 1 +#if !defined (octave_octave_link_h) +#define octave_octave_link_h 1 #include <string>
--- a/libinterp/corefcn/pt-jit.h +++ b/libinterp/corefcn/pt-jit.h @@ -22,8 +22,8 @@ // Author: Max Brister <max@2bass.com> -#if !defined (octave_tree_jit_h) -#define octave_tree_jit_h 1 +#if !defined (octave_pt_jit_h) +#define octave_pt_jit_h 1 #ifdef HAVE_LLVM
--- a/libinterp/octave-value/ov-base-diag.h +++ b/libinterp/octave-value/ov-base-diag.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_base_diag_h) -#define octave_base_diag_h 1 +#if !defined (octave_ov_base_diag_h) +#define octave_ov_base_diag_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-base-int.h +++ b/libinterp/octave-value/ov-base-int.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_base_int_matrix_h) -#define octave_base_int_matrix_h 1 +#if !defined (octave_ov_base_int_h) +#define octave_ov_base_int_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-base-mat.h +++ b/libinterp/octave-value/ov-base-mat.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_base_matrix_h) -#define octave_base_matrix_h 1 +#if !defined (octave_ov_base_mat_h) +#define octave_ov_base_mat_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-base-scalar.h +++ b/libinterp/octave-value/ov-base-scalar.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_base_scalar_h) -#define octave_base_scalar_h 1 +#if !defined (octave_ov_base_scalar_h) +#define octave_ov_base_scalar_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-base-sparse.h +++ b/libinterp/octave-value/ov-base-sparse.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_base_sparse_h) -#define octave_base_sparse_h 1 +#if !defined (octave_ov_base_sparse_h) +#define octave_ov_base_sparse_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-base.h +++ b/libinterp/octave-value/ov-base.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_base_value_h) -#define octave_base_value_h 1 +#if !defined (octave_ov_base_h) +#define octave_ov_base_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-bool-mat.h +++ b/libinterp/octave-value/ov-bool-mat.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_bool_matrix_h) -#define octave_bool_matrix_h 1 +#if !defined (octave_ov_bool_mat_h) +#define octave_ov_bool_mat_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-bool-sparse.h +++ b/libinterp/octave-value/ov-bool-sparse.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_sparse_bool_matrix_h) -#define octave_sparse_bool_matrix_h 1 +#if !defined (octave_ov_bool_sparse_h) +#define octave_ov_bool_sparse_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-bool.h +++ b/libinterp/octave-value/ov-bool.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_bool_h) -#define octave_bool_h 1 +#if !defined (octave_ov_bool_h) +#define octave_ov_bool_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-builtin.h +++ b/libinterp/octave-value/ov-builtin.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_builtin_h) -#define octave_builtin_h 1 +#if !defined (octave_ov_builtin_h) +#define octave_ov_builtin_h 1 #include <string>
--- a/libinterp/octave-value/ov-cell.h +++ b/libinterp/octave-value/ov-cell.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_cell_h) -#define octave_cell_h 1 +#if !defined (octave_ov_cell_h) +#define octave_ov_cell_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-ch-mat.h +++ b/libinterp/octave-value/ov-ch-mat.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_char_matrix_h) -#define octave_char_matrix_h 1 +#if !defined (octave_ov_ch_mat_h) +#define octave_ov_ch_mat_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-class.h +++ b/libinterp/octave-value/ov-class.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_class_h) -#define octave_class_h 1 +#if !defined (octave_ov_class_h) +#define octave_ov_class_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-colon.h +++ b/libinterp/octave-value/ov-colon.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_magic_colon_h) -#define octave_magic_colon_h 1 +#if !defined (octave_ov_colon_h) +#define octave_ov_colon_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-complex.h +++ b/libinterp/octave-value/ov-complex.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_complex_h) -#define octave_complex_h 1 +#if !defined (octave_ov_complex_h) +#define octave_ov_complex_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-cs-list.h +++ b/libinterp/octave-value/ov-cs-list.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_cs_list_h) -#define octave_cs_list_h 1 +#if !defined (octave_ov_cs_list_h) +#define octave_ov_cs_list_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-cx-diag.h +++ b/libinterp/octave-value/ov-cx-diag.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_complex_diag_matrix_h) -#define octave_complex_diag_matrix_h 1 +#if !defined (octave_ov_cx_diag_h) +#define octave_ov_cx_diag_h 1 #include "ov-base.h" #include "ov-base-diag.h"
--- a/libinterp/octave-value/ov-cx-mat.h +++ b/libinterp/octave-value/ov-cx-mat.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_complex_matrix_h) -#define octave_complex_matrix_h 1 +#if !defined (octave_ov_cx_mat_h) +#define octave_ov_cx_mat_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-cx-sparse.h +++ b/libinterp/octave-value/ov-cx-sparse.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_sparse_complex_matrix_h) -#define octave_sparse_complex_matrix_h 1 +#if !defined (octave_ov_cx_sparse_h) +#define octave_ov_cx_sparse_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-dld-fcn.h +++ b/libinterp/octave-value/ov-dld-fcn.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_dld_function_h) -#define octave_dld_function_h 1 +#if !defined (octave_ov_dld_fcn_h) +#define octave_ov_dld_fcn_h 1 #include <string>
--- a/libinterp/octave-value/ov-fcn-handle.h +++ b/libinterp/octave-value/ov-fcn-handle.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_fcn_handle_h) -#define octave_fcn_handle_h 1 +#if !defined (octave_ov_fcn_handle_h) +#define octave_ov_fcn_handle_h 1 #include <iosfwd> #include <string>
--- a/libinterp/octave-value/ov-fcn-inline.h +++ b/libinterp/octave-value/ov-fcn-inline.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_fcn_inline_h) -#define octave_fcn_inline_h 1 +#if !defined (octave_ov_fcn_inline_h) +#define octave_ov_fcn_inline_h 1 #include <iosfwd> #include <string>
--- a/libinterp/octave-value/ov-fcn.h +++ b/libinterp/octave-value/ov-fcn.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_function_h) -#define octave_function_h 1 +#if !defined (octave_ov_fcn_h) +#define octave_ov_fcn_h 1 #include <string>
--- a/libinterp/octave-value/ov-float.h +++ b/libinterp/octave-value/ov-float.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_float_h) -#define octave_float_h 1 +#if !defined (octave_ov_float_h) +#define octave_ov_float_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-flt-complex.h +++ b/libinterp/octave-value/ov-flt-complex.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_float_complex_h) -#define octave_float_complex_h 1 +#if !defined (octave_ov_flt_complex_h) +#define octave_ov_flt_complex_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-flt-cx-diag.h +++ b/libinterp/octave-value/ov-flt-cx-diag.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_float_complex_diag_matrix_h) -#define octave_float_complex_diag_matrix_h 1 +#if !defined (octave_ov_flt_cx_diag_h) +#define octave_ov_flt_cx_diag_h 1 #include "ov-base.h" #include "ov-base-diag.h"
--- a/libinterp/octave-value/ov-flt-cx-mat.h +++ b/libinterp/octave-value/ov-flt-cx-mat.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_float_complex_matrix_h) -#define octave_float_complex_matrix_h 1 +#if !defined (octave_ov_flt_cx_mat_h) +#define octave_ov_flt_cx_mat_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-flt-re-diag.h +++ b/libinterp/octave-value/ov-flt-re-diag.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_float_diag_matrix_h) -#define octave_float_diag_matrix_h 1 +#if !defined (octave_ov_flt_re_diag_h) +#define octave_ov_flt_re_diag_h 1 #include "ov-base.h" #include "ov-base-diag.h"
--- a/libinterp/octave-value/ov-flt-re-mat.h +++ b/libinterp/octave-value/ov-flt-re-mat.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_float_matrix_h) -#define octave_float_matrix_h 1 +#if !defined (octave_ov_flt_re_mat_h) +#define octave_ov_flt_re_mat_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-int-traits.h +++ b/libinterp/octave-value/ov-int-traits.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_value_int_traits_h) -#define octave_value_int_traits_h 1 +#if !defined (octave_ov_int_traits_h) +#define octave_ov_int_traits_h 1 #include "ov-int8.h" #include "ov-int16.h"
--- a/libinterp/octave-value/ov-int16.h +++ b/libinterp/octave-value/ov-int16.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_int16_h) -#define octave_int16_h 1 +#if !defined (octave_ov_int16_h) +#define octave_ov_int16_h 1 #define OCTAVE_INT_T octave_int16
--- a/libinterp/octave-value/ov-int32.h +++ b/libinterp/octave-value/ov-int32.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_int32_h) -#define octave_int32_h 1 +#if !defined (octave_ov_int32_h) +#define octave_ov_int32_h 1 #define OCTAVE_INT_T octave_int32
--- a/libinterp/octave-value/ov-int64.h +++ b/libinterp/octave-value/ov-int64.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_int64_h) -#define octave_int64_h 1 +#if !defined (octave_ov_int64_h) +#define octave_ov_int64_h 1 #define OCTAVE_INT_T octave_int64
--- a/libinterp/octave-value/ov-int8.h +++ b/libinterp/octave-value/ov-int8.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_int8_h) -#define octave_int8_h 1 +#if !defined (octave_ov_int8_h) +#define octave_ov_int8_h 1 #define OCTAVE_INT_T octave_int8
--- a/libinterp/octave-value/ov-java.h +++ b/libinterp/octave-value/ov-java.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_java_h) -#define octave_java_h 1 +#if !defined (octave_ov_java_h) +#define octave_ov_java_h 1 #include <jni.h>
--- a/libinterp/octave-value/ov-lazy-idx.h +++ b/libinterp/octave-value/ov-lazy-idx.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_lazy_idx_h) -#define octave_lazy_idx_h 1 +#if !defined (octave_ov_lazy_idx_h) +#define octave_ov_lazy_idx_h 1 #include "ov-re-mat.h"
--- a/libinterp/octave-value/ov-mex-fcn.h +++ b/libinterp/octave-value/ov-mex-fcn.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_mex_function_h) -#define octave_mex_function_h 1 +#if !defined (octave_ov_mex_fcn_h) +#define octave_ov_mex_fcn_h 1 #include <string>
--- a/libinterp/octave-value/ov-null-mat.h +++ b/libinterp/octave-value/ov-null-mat.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_null_matrix_h) -#define octave_null_matrix_h 1 +#if !defined (octave_ov_null_mat_h) +#define octave_ov_null_mat_h 1 #include "ov.h" #include "ov-re-mat.h"
--- a/libinterp/octave-value/ov-perm.h +++ b/libinterp/octave-value/ov-perm.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_perm_matrix_h) -#define octave_perm_matrix_h 1 +#if !defined (octave_ov_perm_h) +#define octave_ov_perm_h 1 #include "mx-base.h" #include "str-vec.h"
--- a/libinterp/octave-value/ov-range.h +++ b/libinterp/octave-value/ov-range.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_range_h) -#define octave_range_h 1 +#if !defined (octave_ov_range_h) +#define octave_ov_range_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-re-diag.h +++ b/libinterp/octave-value/ov-re-diag.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_diag_matrix_h) -#define octave_diag_matrix_h 1 +#if !defined (octave_ov_re_diag_h) +#define octave_ov_re_diag_h 1 #include "ov-base.h" #include "ov-base-diag.h"
--- a/libinterp/octave-value/ov-re-mat.h +++ b/libinterp/octave-value/ov-re-mat.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_matrix_h) -#define octave_matrix_h 1 +#if !defined (octave_ov_re_mat_h) +#define octave_ov_re_mat_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-re-sparse.h +++ b/libinterp/octave-value/ov-re-sparse.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_sparse_matrix_h) -#define octave_sparse_matrix_h 1 +#if !defined (octave_ov_re_sparse_h) +#define octave_ov_re_sparse_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-scalar.h +++ b/libinterp/octave-value/ov-scalar.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_scalar_h) -#define octave_scalar_h 1 +#if !defined (octave_ov_scalar_h) +#define octave_ov_scalar_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-str-mat.h +++ b/libinterp/octave-value/ov-str-mat.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_char_matrix_str_h) -#define octave_char_matrix_str_h 1 +#if !defined (octave_ov_str_mat_h) +#define octave_ov_str_mat_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-struct.h +++ b/libinterp/octave-value/ov-struct.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_struct_h) -#define octave_struct_h 1 +#if !defined (octave_ov_struct_h) +#define octave_ov_struct_h 1 #include <cstdlib>
--- a/libinterp/octave-value/ov-typeinfo.h +++ b/libinterp/octave-value/ov-typeinfo.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_value_typeinfo_h) -#define octave_value_typeinfo_h 1 +#if !defined (octave_ov_typeinfo_h) +#define octave_ov_typeinfo_h 1 #include <string>
--- a/libinterp/octave-value/ov-uint16.h +++ b/libinterp/octave-value/ov-uint16.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_uint16_h) -#define octave_uint16_h 1 +#if !defined (octave_ov_uint16_h) +#define octave_ov_uint16_h 1 #define OCTAVE_INT_T octave_uint16
--- a/libinterp/octave-value/ov-uint32.h +++ b/libinterp/octave-value/ov-uint32.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_uint32_h) -#define octave_uint32_h 1 +#if !defined (octave_ov_uint32_h) +#define octave_ov_uint32_h 1 #define OCTAVE_INT_T octave_uint32
--- a/libinterp/octave-value/ov-uint64.h +++ b/libinterp/octave-value/ov-uint64.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_uint64_h) -#define octave_uint64_h 1 +#if !defined (octave_ov_uint64_h) +#define octave_ov_uint64_h 1 #define OCTAVE_INT_T octave_uint64
--- a/libinterp/octave-value/ov-uint8.h +++ b/libinterp/octave-value/ov-uint8.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_uint8_h) -#define octave_uint8_h 1 +#if !defined (octave_ov_uint8_h) +#define octave_ov_uint8_h 1 #define OCTAVE_INT_T octave_uint8
--- a/libinterp/octave-value/ov-usr-fcn.h +++ b/libinterp/octave-value/ov-usr-fcn.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_user_function_h) -#define octave_user_function_h 1 +#if !defined (octave_ov_usr_fcn_h) +#define octave_ov_usr_fcn_h 1 #include <ctime>
--- a/libinterp/octave-value/ov.h +++ b/libinterp/octave-value/ov.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_value_h) -#define octave_value_h 1 +#if !defined (octave_ov_h) +#define octave_ov_h 1 #include <cstdlib>
--- a/libinterp/parse-tree/pt-all.h +++ b/libinterp/parse-tree/pt-all.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_all_h) -#define octave_tree_all_h 1 +#if !defined (octave_pt_all_h) +#define octave_pt_all_h 1 #include "pt.h" #include "pt-arg-list.h"
--- a/libinterp/parse-tree/pt-arg-list.h +++ b/libinterp/parse-tree/pt-arg-list.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_arg_list_h) -#define octave_tree_arg_list_h 1 +#if !defined (octave_pt_arg_list_h) +#define octave_pt_arg_list_h 1 #include <list>
--- a/libinterp/parse-tree/pt-array-list.h +++ b/libinterp/parse-tree/pt-array-list.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_array_list_h) -#define octave_tree_array_list_h 1 +#if !defined (octave_pt_array_list_h) +#define octave_pt_array_list_h 1 #include "base-list.h" #include "pt-arg-list.h"
--- a/libinterp/parse-tree/pt-assign.h +++ b/libinterp/parse-tree/pt-assign.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_assign_h) -#define octave_tree_assign_h 1 +#if !defined (octave_pt_assign_h) +#define octave_pt_assign_h 1 #include <iosfwd> #include <string>
--- a/libinterp/parse-tree/pt-binop.h +++ b/libinterp/parse-tree/pt-binop.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_binop_h) -#define octave_tree_binop_h 1 +#if !defined (octave_pt_binop_h) +#define octave_pt_binop_h 1 #include <string>
--- a/libinterp/parse-tree/pt-bp.h +++ b/libinterp/parse-tree/pt-bp.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_bp_h) -#define octave_tree_bp_h 1 +#if !defined (octave_pt_bp_h) +#define octave_pt_bp_h 1 #include "input.h" #include "ov-usr-fcn.h"
--- a/libinterp/parse-tree/pt-cbinop.h +++ b/libinterp/parse-tree/pt-cbinop.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_cbinop_h) -#define octave_tree_cbinop_h 1 +#if !defined (octave_pt_cbinop_h) +#define octave_pt_cbinop_h 1 #include <string>
--- a/libinterp/parse-tree/pt-cell.h +++ b/libinterp/parse-tree/pt-cell.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_cell_h) -#define octave_tree_cell_h 1 +#if !defined (octave_pt_cell_h) +#define octave_pt_cell_h 1 #include <iosfwd>
--- a/libinterp/parse-tree/pt-check.h +++ b/libinterp/parse-tree/pt-check.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_checker_h) -#define octave_tree_checker_h 1 +#if !defined (octave_pt_check_h) +#define octave_pt_check_h 1 #include "pt-walk.h"
--- a/libinterp/parse-tree/pt-cmd.h +++ b/libinterp/parse-tree/pt-cmd.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_cmd_h) -#define octave_tree_cmd_h 1 +#if !defined (octave_pt_cmd_h) +#define octave_pt_cmd_h 1 #include <string>
--- a/libinterp/parse-tree/pt-colon.h +++ b/libinterp/parse-tree/pt-colon.h @@ -20,7 +20,7 @@ */ -#if !defined (octave_tree_colon_h) +#if !defined (octave_pt_colon_h) #define octave_tree_colon 1 #include <string>
--- a/libinterp/parse-tree/pt-const.h +++ b/libinterp/parse-tree/pt-const.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_const_h) -#define octave_tree_const_h 1 +#if !defined (octave_pt_const_h) +#define octave_pt_const_h 1 #include <iosfwd> #include <string>
--- a/libinterp/parse-tree/pt-decl.h +++ b/libinterp/parse-tree/pt-decl.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_decl_h) -#define octave_tree_decl_h 1 +#if !defined (octave_pt_decl_h) +#define octave_pt_decl_h 1 class tree_expression; class tree_identifier;
--- a/libinterp/parse-tree/pt-eval.h +++ b/libinterp/parse-tree/pt-eval.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_eval_h) -#define octave_tree_eval_h 1 +#if !defined (octave_pt_eval_h) +#define octave_pt_eval_h 1 #include <stack> #include <string>
--- a/libinterp/parse-tree/pt-except.h +++ b/libinterp/parse-tree/pt-except.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_except_h) -#define octave_tree_except_h 1 +#if !defined (octave_pt_except_h) +#define octave_pt_except_h 1 class tree_statement_list;
--- a/libinterp/parse-tree/pt-exp.h +++ b/libinterp/parse-tree/pt-exp.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_expr_h) -#define octave_tree_expr_h 1 +#if !defined (octave_pt_exp_h) +#define octave_pt_exp_h 1 #include <string> #include <list>
--- a/libinterp/parse-tree/pt-fcn-handle.h +++ b/libinterp/parse-tree/pt-fcn-handle.h @@ -20,7 +20,7 @@ */ -#if !defined (octave_tree_fcn_handle_h) +#if !defined (octave_pt_fcn_handle_h) #define octave_fcn_handle_h 1 #include <iosfwd>
--- a/libinterp/parse-tree/pt-id.h +++ b/libinterp/parse-tree/pt-id.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_identifier_h) -#define octave_tree_identifier_h 1 +#if !defined (octave_pt_id_h) +#define octave_pt_id_h 1 #include <iosfwd> #include <string>
--- a/libinterp/parse-tree/pt-idx.h +++ b/libinterp/parse-tree/pt-idx.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_index_h) -#define octave_tree_index_h 1 +#if !defined (octave_pt_idx_h) +#define octave_pt_idx_h 1 #include <list>
--- a/libinterp/parse-tree/pt-jump.h +++ b/libinterp/parse-tree/pt-jump.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_jump_h) -#define octave_tree_jump_h 1 +#if !defined (octave_pt_jump_h) +#define octave_pt_jump_h 1 class tree_walker;
--- a/libinterp/parse-tree/pt-loop.h +++ b/libinterp/parse-tree/pt-loop.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_loop_h) -#define octave_tree_loop_h 1 +#if !defined (octave_pt_loop_h) +#define octave_pt_loop_h 1 class octave_value; class octave_lvalue;
--- a/libinterp/parse-tree/pt-mat.h +++ b/libinterp/parse-tree/pt-mat.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_mat_h) -#define octave_tree_mat_h 1 +#if !defined (octave_pt_mat_h) +#define octave_pt_mat_h 1 #include <iosfwd>
--- a/libinterp/parse-tree/pt-misc.h +++ b/libinterp/parse-tree/pt-misc.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_misc_h) -#define octave_tree_misc_h 1 +#if !defined (octave_pt_misc_h) +#define octave_pt_misc_h 1 class Cell;
--- a/libinterp/parse-tree/pt-pr-code.h +++ b/libinterp/parse-tree/pt-pr-code.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_print_code_h) -#define octave_tree_print_code_h 1 +#if !defined (octave_pt_pr_code_h) +#define octave_pt_pr_code_h 1 #include <stack> #include <string>
--- a/libinterp/parse-tree/pt-select.h +++ b/libinterp/parse-tree/pt-select.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_select_h) -#define octave_tree_select_h 1 +#if !defined (octave_pt_select_h) +#define octave_pt_select_h 1 class expression; class tree_statement_list;
--- a/libinterp/parse-tree/pt-stmt.h +++ b/libinterp/parse-tree/pt-stmt.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_stmt_h) -#define octave_tree_stmt_h 1 +#if !defined (octave_pt_stmt_h) +#define octave_pt_stmt_h 1 class octave_value_list;
--- a/libinterp/parse-tree/pt-unop.h +++ b/libinterp/parse-tree/pt-unop.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_unop_h) -#define octave_tree_unop_h 1 +#if !defined (octave_pt_unop_h) +#define octave_pt_unop_h 1 #include <string>
--- a/libinterp/parse-tree/pt-walk.h +++ b/libinterp/parse-tree/pt-walk.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_walker_h) -#define octave_tree_walker_h 1 +#if !defined (octave_pt_walk_h) +#define octave_pt_walk_h 1 class tree_anon_fcn_handle; class tree_argument_list;
--- a/libinterp/parse-tree/pt.h +++ b/libinterp/parse-tree/pt.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_tree_h) -#define octave_tree_h 1 +#if !defined (octave_pt_h) +#define octave_pt_h 1 #include <string>
--- a/liboctave/array/CColVector.h +++ b/liboctave/array/CColVector.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_ComplexColumnVector_h) -#define octave_ComplexColumnVector_h 1 +#if !defined (octave_CColVector_h) +#define octave_CColVector_h 1 #include "MArray.h"
--- a/liboctave/array/CDiagMatrix.h +++ b/liboctave/array/CDiagMatrix.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_ComplexDiagMatrix_h) -#define octave_ComplexDiagMatrix_h 1 +#if !defined (octave_CDiagMatrix_h) +#define octave_CDiagMatrix_h 1 #include "MDiagArray2.h"
--- a/liboctave/array/CMatrix.h +++ b/liboctave/array/CMatrix.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_ComplexMatrix_h) -#define octave_ComplexMatrix_h 1 +#if !defined (octave_CMatrix_h) +#define octave_CMatrix_h 1 #include "MArray.h" #include "MDiagArray2.h"
--- a/liboctave/array/CNDArray.h +++ b/liboctave/array/CNDArray.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_ComplexNDArray_h) -#define octave_ComplexNDArray_h 1 +#if !defined (octave_CNDArray_h) +#define octave_CNDArray_h 1 #include "MArray.h" #include "CMatrix.h"
--- a/liboctave/array/CRowVector.h +++ b/liboctave/array/CRowVector.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_ComplexRowVector_h) -#define octave_ComplexRowVector_h 1 +#if !defined (octave_CRowVector_h) +#define octave_CRowVector_h 1 #include "MArray.h" #include "dRowVector.h"
--- a/liboctave/array/boolMatrix.h +++ b/liboctave/array/boolMatrix.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_boolMatrix_int_h) -#define octave_boolMatrix_int_h 1 +#if !defined (octave_boolMatrix_h) +#define octave_boolMatrix_h 1 #include "Array.h"
--- a/liboctave/array/chMatrix.h +++ b/liboctave/array/chMatrix.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_chMatrix_int_h) -#define octave_chMatrix_int_h 1 +#if !defined (octave_chMatrix_h) +#define octave_chMatrix_h 1 #include <string>
--- a/liboctave/array/chNDArray.h +++ b/liboctave/array/chNDArray.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_charNDArray_h) -#define octave_charNDArray_h 1 +#if !defined (octave_chNDArray_h) +#define octave_chNDArray_h 1 #include "Array.h" #include "chMatrix.h"
--- a/liboctave/array/dColVector.h +++ b/liboctave/array/dColVector.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_ColumnVector_h) -#define octave_ColumnVector_h 1 +#if !defined (octave_dColVector_h) +#define octave_dColVector_h 1 #include "MArray.h"
--- a/liboctave/array/dDiagMatrix.h +++ b/liboctave/array/dDiagMatrix.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_DiagMatrix_h) -#define octave_DiagMatrix_h 1 +#if !defined (octave_dDiagMatrix_h) +#define octave_dDiagMatrix_h 1 #include "MDiagArray2.h"
--- a/liboctave/array/dMatrix.h +++ b/liboctave/array/dMatrix.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_Matrix_int_h) -#define octave_Matrix_int_h 1 +#if !defined (octave_dMatrix_h) +#define octave_dMatrix_h 1 #include "MArray.h" #include "MDiagArray2.h"
--- a/liboctave/array/dNDArray.h +++ b/liboctave/array/dNDArray.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_NDArray_h) -#define octave_NDArray_h 1 +#if !defined (octave_dNDArray_h) +#define octave_dNDArray_h 1 #include "MArray.h" #include "dMatrix.h"
--- a/liboctave/array/dRowVector.h +++ b/liboctave/array/dRowVector.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_RowVector_h) -#define octave_RowVector_h 1 +#if !defined (octave_dRowVector_h) +#define octave_dRowVector_h 1 #include "MArray.h"
--- a/liboctave/array/fCColVector.h +++ b/liboctave/array/fCColVector.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_FloatComplexColumnVector_h) -#define octave_FloatComplexColumnVector_h 1 +#if !defined (octave_fCColVector_h) +#define octave_fCColVector_h 1 #include "MArray.h"
--- a/liboctave/array/fCDiagMatrix.h +++ b/liboctave/array/fCDiagMatrix.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatComplexDiagMatrix_h) -#define octave_FloatComplexDiagMatrix_h 1 +#if !defined (octave_fCDiagMatrix_h) +#define octave_fCDiagMatrix_h 1 #include "MDiagArray2.h"
--- a/liboctave/array/fCMatrix.h +++ b/liboctave/array/fCMatrix.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatComplexMatrix_h) -#define octave_FloatComplexMatrix_h 1 +#if !defined (octave_fCMatrix_h) +#define octave_fCMatrix_h 1 #include "MArray.h" #include "MDiagArray2.h"
--- a/liboctave/array/fCNDArray.h +++ b/liboctave/array/fCNDArray.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatComplexNDArray_h) -#define octave_FloatComplexNDArray_h 1 +#if !defined (octave_fCNDArray_h) +#define octave_fCNDArray_h 1 #include "MArray.h" #include "fCMatrix.h"
--- a/liboctave/array/fCRowVector.h +++ b/liboctave/array/fCRowVector.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatComplexRowVector_h) -#define octave_FloatComplexRowVector_h 1 +#if !defined (octave_fCRowVector_h) +#define octave_fCRowVector_h 1 #include "MArray.h" #include "fRowVector.h"
--- a/liboctave/array/fColVector.h +++ b/liboctave/array/fColVector.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_FloatColumnVector_h) -#define octave_FloatColumnVector_h 1 +#if !defined (octave_fColVector_h) +#define octave_fColVector_h 1 #include "MArray.h"
--- a/liboctave/array/fDiagMatrix.h +++ b/liboctave/array/fDiagMatrix.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatDiagMatrix_h) -#define octave_FloatDiagMatrix_h 1 +#if !defined (octave_fDiagMatrix_h) +#define octave_fDiagMatrix_h 1 #include "MDiagArray2.h"
--- a/liboctave/array/fMatrix.h +++ b/liboctave/array/fMatrix.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatMatrix_int_h) -#define octave_FloatMatrix_int_h 1 +#if !defined (octave_fMatrix_h) +#define octave_fMatrix_h 1 #include "MArray.h" #include "MDiagArray2.h"
--- a/liboctave/array/fNDArray.h +++ b/liboctave/array/fNDArray.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatNDArray_h) -#define octave_FloatNDArray_h 1 +#if !defined (octave_fNDArray_h) +#define octave_fNDArray_h 1 #include "MArray.h" #include "fMatrix.h"
--- a/liboctave/array/fRowVector.h +++ b/liboctave/array/fRowVector.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatRowVector_h) -#define octave_FloatRowVector_h 1 +#if !defined (octave_fRowVector_h) +#define octave_fRowVector_h 1 #include "MArray.h"
--- a/liboctave/cruft/misc/lo-error.h +++ b/liboctave/cruft/misc/lo-error.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_liboctave_error_h) -#define octave_liboctave_error_h 1 +#if !defined (octave_lo_error_h) +#define octave_lo_error_h 1 #ifdef __cplusplus extern "C" {
--- a/liboctave/numeric/CmplxAEPBAL.h +++ b/liboctave/numeric/CmplxAEPBAL.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_ComplexAEPBALANCE_h) -#define octave_ComplexAEPBALANCE_h 1 +#if !defined (octave_CmplxAEPBAL_h) +#define octave_CmplxAEPBAL_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/CmplxCHOL.h +++ b/liboctave/numeric/CmplxCHOL.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_ComplexCHOL_h) -#define octave_ComplexCHOL_h 1 +#if !defined (octave_CmplxCHOL_h) +#define octave_CmplxCHOL_h 1 #include <iosfwd>
--- a/liboctave/numeric/CmplxGEPBAL.h +++ b/liboctave/numeric/CmplxGEPBAL.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_ComplexGEPBALANCE_h) -#define octave_ComplexGEPBALANCE_h 1 +#if !defined (octave_CmplxGEPBAL_h) +#define octave_CmplxGEPBAL_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/CmplxHESS.h +++ b/liboctave/numeric/CmplxHESS.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_ComplexHESS_h) -#define octave_ComplexHESS_h 1 +#if !defined (octave_CmplxHESS_h) +#define octave_CmplxHESS_h 1 #include <iosfwd>
--- a/liboctave/numeric/CmplxLU.h +++ b/liboctave/numeric/CmplxLU.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_ComplexLU_h) -#define octave_ComplexLU_h 1 +#if !defined (octave_CmplxLU_h) +#define octave_CmplxLU_h 1 #include "base-lu.h" #include "dMatrix.h"
--- a/liboctave/numeric/CmplxQR.h +++ b/liboctave/numeric/CmplxQR.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_ComplexQR_h) -#define octave_ComplexQR_h 1 +#if !defined (octave_CmplxQR_h) +#define octave_CmplxQR_h 1 #include <iosfwd>
--- a/liboctave/numeric/CmplxQRP.h +++ b/liboctave/numeric/CmplxQRP.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_ComplexQRP_h) -#define octave_ComplexQRP_h 1 +#if !defined (octave_CmplxQRP_h) +#define octave_CmplxQRP_h 1 #include <iosfwd>
--- a/liboctave/numeric/CmplxSCHUR.h +++ b/liboctave/numeric/CmplxSCHUR.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_ComplexSCHUR_h) -#define octave_ComplexSCHUR_h 1 +#if !defined (octave_CmplxSCHUR_h) +#define octave_CmplxSCHUR_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/CmplxSVD.h +++ b/liboctave/numeric/CmplxSVD.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_ComplexSVD_h) -#define octave_ComplexSVD_h 1 +#if !defined (octave_CmplxSVD_h) +#define octave_CmplxSVD_h 1 #include <iosfwd>
--- a/liboctave/numeric/Quad.h +++ b/liboctave/numeric/Quad.h @@ -29,14 +29,9 @@ #include "fColVector.h" #include "lo-math.h" -#if !defined (octave_Quad_typedefs) -#define octave_Quad_typedefs 1 - typedef double (*integrand_fcn) (double x); typedef float (*float_integrand_fcn) (float x); -#endif - // FIXME: would be nice to not have to have this global variable. // Nonzero means an error occurred in the calculation of the integrand // function, and the user wants us to quit.
--- a/liboctave/numeric/SparseCmplxCHOL.h +++ b/liboctave/numeric/SparseCmplxCHOL.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_sparse_complex_CHOL_h) -#define octave_sparse_complex_CHOL_h 1 +#if !defined (octave_SparseCmplxCHOL_h) +#define octave_SparseCmplxCHOL_h 1 #include "sparse-base-chol.h" #include "dSparse.h"
--- a/liboctave/numeric/SparseCmplxLU.h +++ b/liboctave/numeric/SparseCmplxLU.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_sparse_complex_LU_h) -#define octave_sparse_complex_LU_h 1 +#if !defined (octave_SparseCmplxLU_h) +#define octave_SparseCmplxLU_h 1 #include "sparse-base-lu.h" #include "dSparse.h"
--- a/liboctave/numeric/SparseCmplxQR.h +++ b/liboctave/numeric/SparseCmplxQR.h @@ -20,8 +20,8 @@ */ -#if !defined (sparse_cmplx_QR_h) -#define sparse_cmplx_QR_h 1 +#if !defined (octave_SparseCmplxQR_h) +#define octave_SparseCmplxQR_h 1 #include <iosfwd>
--- a/liboctave/numeric/SparseQR.h +++ b/liboctave/numeric/SparseQR.h @@ -20,8 +20,8 @@ */ -#if !defined (sparse_QR_h) -#define sparse_QR_h 1 +#if !defined (octave_SparseQR_h) +#define octave_SparseQR_h 1 #include <iosfwd>
--- a/liboctave/numeric/SparsedbleCHOL.h +++ b/liboctave/numeric/SparsedbleCHOL.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_sparse_CHOL_h) -#define octave_sparse_CHOL_h 1 +#if !defined (octave_SparsedbleCHOL_h) +#define octave_SparsedbleCHOL_h 1 #include "sparse-base-chol.h" #include "dSparse.h"
--- a/liboctave/numeric/SparsedbleLU.h +++ b/liboctave/numeric/SparsedbleLU.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_sparse_LU_h) -#define octave_sparse_LU_h 1 +#if !defined (octave_SparsedbleLU_h) +#define octave_SparsedbleLU_h 1 #include "sparse-base-lu.h" #include "dSparse.h"
--- a/liboctave/numeric/bsxfun.h +++ b/liboctave/numeric/bsxfun.h @@ -22,8 +22,8 @@ // Author: Jordi Gutiérrez Hermoso <jordigh@octave.org> -#if !defined (bsxfun_h) -#define bsxfun_h 1 +#if !defined (octave_bsxfun_h) +#define octave_bsxfun_h 1 #include <algorithm>
--- a/liboctave/numeric/dbleAEPBAL.h +++ b/liboctave/numeric/dbleAEPBAL.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_AEPBALANCE_h) -#define octave_AEPBALANCE_h 1 +#if !defined (octave_dbleAEPBAL_h) +#define octave_dbleAEPBAL_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/dbleCHOL.h +++ b/liboctave/numeric/dbleCHOL.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_CHOL_h) -#define octave_CHOL_h 1 +#if !defined (octave_dbleCHOL_h) +#define octave_dbleCHOL_h 1 #include <iosfwd>
--- a/liboctave/numeric/dbleGEPBAL.h +++ b/liboctave/numeric/dbleGEPBAL.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_GEPBALANCE_h) -#define octave_GEPBALANCE_h 1 +#if !defined (octave_dbleGEPBAL_h) +#define octave_dbleGEPBAL_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/dbleHESS.h +++ b/liboctave/numeric/dbleHESS.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_HESS_h) -#define octave_HESS_h 1 +#if !defined (octave_dbleHESS_h) +#define octave_dbleHESS_h 1 #include <iosfwd>
--- a/liboctave/numeric/dbleLU.h +++ b/liboctave/numeric/dbleLU.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_LU_h) -#define octave_LU_h 1 +#if !defined (octave_dbleLU_h) +#define octave_dbleLU_h 1 #include "base-lu.h" #include "dMatrix.h"
--- a/liboctave/numeric/dbleQR.h +++ b/liboctave/numeric/dbleQR.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_QR_h) -#define octave_QR_h 1 +#if !defined (octave_dbleQR_h) +#define octave_dbleQR_h 1 #include <iosfwd>
--- a/liboctave/numeric/dbleQRP.h +++ b/liboctave/numeric/dbleQRP.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_QRP_h) -#define octave_QRP_h 1 +#if !defined (octave_dbleQRP_h) +#define octave_dbleQRP_h 1 #include <iosfwd>
--- a/liboctave/numeric/dbleSCHUR.h +++ b/liboctave/numeric/dbleSCHUR.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_SCHUR_h) -#define octave_SCHUR_h 1 +#if !defined (octave_dbleSCHUR_h) +#define octave_dbleSCHUR_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/dbleSVD.h +++ b/liboctave/numeric/dbleSVD.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_SVD_h) -#define octave_SVD_h 1 +#if !defined (octave_dbleSVD_h) +#define octave_dbleSVD_h 1 #include <iosfwd>
--- a/liboctave/numeric/fCmplxAEPBAL.h +++ b/liboctave/numeric/fCmplxAEPBAL.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_FloatComplexAEPBALANCE_h) -#define octave_FloatComplexAEPBALANCE_h 1 +#if !defined (octave_fCmplxAEPBAL_h) +#define octave_fCmplxAEPBAL_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/fCmplxCHOL.h +++ b/liboctave/numeric/fCmplxCHOL.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_FloatComplexCHOL_h) -#define octave_FloatComplexCHOL_h 1 +#if !defined (octave_fCmplxCHOL_h) +#define octave_fCmplxCHOL_h 1 #include <iosfwd>
--- a/liboctave/numeric/fCmplxGEPBAL.h +++ b/liboctave/numeric/fCmplxGEPBAL.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatComplexGEPBALANCE_h) -#define octave_FloatComplexGEPBALANCE_h 1 +#if !defined (octave_fCmplxGEPBAL_h) +#define octave_fCmplxGEPBAL_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/fCmplxHESS.h +++ b/liboctave/numeric/fCmplxHESS.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatComplexHESS_h) -#define octave_FloatComplexHESS_h 1 +#if !defined (octave_fCmplxHESS_h) +#define octave_fCmplxHESS_h 1 #include <iosfwd>
--- a/liboctave/numeric/fCmplxLU.h +++ b/liboctave/numeric/fCmplxLU.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatComplexLU_h) -#define octave_FloatComplexLU_h 1 +#if !defined (octave_fCmplxLU_h) +#define octave_fCmplxLU_h 1 #include "base-lu.h" #include "dMatrix.h"
--- a/liboctave/numeric/fCmplxQR.h +++ b/liboctave/numeric/fCmplxQR.h @@ -23,8 +23,8 @@ // updating/downdating by Jaroslav Hajek 2008 -#if !defined (octave_FloatComplexQR_h) -#define octave_FloatComplexQR_h 1 +#if !defined (octave_fCmplxQR_h) +#define octave_fCmplxQR_h 1 #include <iosfwd>
--- a/liboctave/numeric/fCmplxQRP.h +++ b/liboctave/numeric/fCmplxQRP.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatComplexQRP_h) -#define octave_FloatComplexQRP_h 1 +#if !defined (octave_fCmplxQRP_h) +#define octave_fCmplxQRP_h 1 #include <iosfwd>
--- a/liboctave/numeric/fCmplxSCHUR.h +++ b/liboctave/numeric/fCmplxSCHUR.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatComplexSCHUR_h) -#define octave_FloatComplexSCHUR_h 1 +#if !defined (octave_fCmplxSCHUR_h) +#define octave_fCmplxSCHUR_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/fCmplxSVD.h +++ b/liboctave/numeric/fCmplxSVD.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatComplexSVD_h) -#define octave_FloatComplexSVD_h 1 +#if !defined (octave_fCmplxSVD_h) +#define octave_fCmplxSVD_h 1 #include <iosfwd>
--- a/liboctave/numeric/fEIG.h +++ b/liboctave/numeric/fEIG.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_float_EIG_h) -#define octave_float_EIG_h 1 +#if !defined (octave_fEIG_h) +#define octave_fEIG_h 1 #include <iosfwd>
--- a/liboctave/numeric/floatAEPBAL.h +++ b/liboctave/numeric/floatAEPBAL.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_FloatAEPBALANCE_h) -#define octave_FloatAEPBALANCE_h 1 +#if !defined (octave_floatAEPBAL_h) +#define octave_floatAEPBAL_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/floatCHOL.h +++ b/liboctave/numeric/floatCHOL.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_FloatCHOL_h) -#define octave_FloatCHOL_h 1 +#if !defined (octave_floatCHOL_h) +#define octave_floatCHOL_h 1 #include <iosfwd>
--- a/liboctave/numeric/floatGEPBAL.h +++ b/liboctave/numeric/floatGEPBAL.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatGEPBALANCE_h) -#define octave_FloatGEPBALANCE_h 1 +#if !defined (octave_floatGEPBAL_h) +#define octave_floatGEPBAL_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/floatHESS.h +++ b/liboctave/numeric/floatHESS.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatHESS_h) -#define octave_FloatHESS_h 1 +#if !defined (octave_floatHESS_h) +#define octave_floatHESS_h 1 #include <iosfwd>
--- a/liboctave/numeric/floatLU.h +++ b/liboctave/numeric/floatLU.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatLU_h) -#define octave_FloatLU_h 1 +#if !defined (octave_floatLU_h) +#define octave_floatLU_h 1 #include "base-lu.h" #include "dMatrix.h"
--- a/liboctave/numeric/floatQR.h +++ b/liboctave/numeric/floatQR.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_FloatQR_h) -#define octave_FloatQR_h 1 +#if !defined (octave_floatQR_h) +#define octave_floatQR_h 1 #include <iosfwd>
--- a/liboctave/numeric/floatQRP.h +++ b/liboctave/numeric/floatQRP.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatQRP_h) -#define octave_FloatQRP_h 1 +#if !defined (octave_floatQRP_h) +#define octave_floatQRP_h 1 #include <iosfwd>
--- a/liboctave/numeric/floatSCHUR.h +++ b/liboctave/numeric/floatSCHUR.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatSCHUR_h) -#define octave_FloatSCHUR_h 1 +#if !defined (octave_floatSCHUR_h) +#define octave_floatSCHUR_h 1 #include <iosfwd> #include <string>
--- a/liboctave/numeric/floatSVD.h +++ b/liboctave/numeric/floatSVD.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_FloatSVD_h) -#define octave_FloatSVD_h 1 +#if !defined (octave_floatSVD_h) +#define octave_floatSVD_h 1 #include <iosfwd>
--- a/liboctave/numeric/lo-mappers.h +++ b/liboctave/numeric/lo-mappers.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_liboctave_mappers_h) -#define octave_liboctave_mappers_h 1 +#if !defined (octave_lo_mappers_h) +#define octave_lo_mappers_h 1 #include <limits>
--- a/liboctave/numeric/lo-specfun.h +++ b/liboctave/numeric/lo-specfun.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_liboctave_specfun_h) -#define octave_liboctave_specfun_h 1 +#if !defined (octave_lo_specfun_h) +#define octave_lo_specfun_h 1 #include "oct-cmplx.h" #include "Array.h" @@ -41,75 +41,75 @@ class FloatComplexColumnVector; class Range; -#if !defined (HAVE_ACOSH) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API double acosh (double); #endif -#if !defined (HAVE_ASINH) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API double asinh (double); #endif -#if !defined (HAVE_ATANH) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API double atanh (double); #endif -#if !defined (HAVE_ERF) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API double erf (double); #endif extern OCTAVE_API Complex erf (const Complex& x); extern OCTAVE_API FloatComplex erf (const FloatComplex& x); -#if !defined (HAVE_ERFC) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API double erfc (double); #endif extern OCTAVE_API Complex erfc (const Complex& x); extern OCTAVE_API FloatComplex erfc (const FloatComplex& x); -#if !defined (HAVE_ACOSHF) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API float acoshf (float); #endif -#if !defined (HAVE_ASINHF) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API float asinhf (float); #endif -#if !defined (HAVE_ATANHF) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API float atanhf (float); #endif -#if !defined (HAVE_ERFF) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API float erff (float); #endif -#if !defined (HAVE_ERFCF) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API float erfcf (float); #endif -#if !defined (HAVE_EXPM1) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API double expm1 (double x); #endif extern OCTAVE_API Complex expm1 (const Complex& x); -#if !defined (HAVE_EXPM1F) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API float expm1f (float x); #endif extern OCTAVE_API FloatComplex expm1 (const FloatComplex& x); -#if !defined (HAVE_LOG1P) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API double log1p (double x); #endif extern OCTAVE_API Complex log1p (const Complex& x); -#if !defined (HAVE_LOG1PF) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API float log1pf (float x); #endif extern OCTAVE_API FloatComplex log1p (const FloatComplex& x); -#if !defined (HAVE_CBRT) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API double cbrt (double x); #endif -#if !defined (HAVE_CBRTF) +#if !defined (octave_lo_specfun_h) extern OCTAVE_API float cbrtf (float x); #endif
--- a/liboctave/numeric/oct-convn.h +++ b/liboctave/numeric/oct-convn.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_convn_h) -#define octave_convn_h 1 +#if !defined (octave_oct_convn_h) +#define octave_oct_convn_h 1 #include "dMatrix.h" #include "fMatrix.h"
--- a/liboctave/numeric/oct-norm.h +++ b/liboctave/numeric/oct-norm.h @@ -22,8 +22,8 @@ // author: Jaroslav Hajek <highegg@gmail.com> -#if !defined (octave_norm_h) -#define octave_norm_h 1 +#if !defined (octave_oct_norm_h) +#define octave_oct_norm_h 1 #include "oct-cmplx.h"
--- a/liboctave/numeric/oct-rand.h +++ b/liboctave/numeric/oct-rand.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_rand_h) -#define octave_rand_h 1 +#if !defined (octave_oct_rand_h) +#define octave_oct_rand_h 1 #include <map> #include <string>
--- a/liboctave/operators/Sparse-diag-op-defs.h +++ b/liboctave/operators/Sparse-diag-op-defs.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_sparse_diag_op_defs_h) -#define octave_sparse_diag_op_defs_h 1 +#if !defined (octave_Sparse_diag_op_defs_h) +#define octave_Sparse_diag_op_defs_h 1 // Matrix multiplication @@ -233,4 +233,4 @@ std::negate<typename DM::element_type> ()); } -#endif // octave_sparse_diag_op_defs_h +#endif // octave_Sparse_diag_op_defs_h
--- a/liboctave/operators/Sparse-op-defs.h +++ b/liboctave/operators/Sparse-op-defs.h @@ -22,8 +22,8 @@ */ -#if !defined (octave_sparse_op_defs_h) -#define octave_sparse_op_defs_h 1 +#if !defined (octave_Sparse_op_defs_h) +#define octave_Sparse_op_defs_h 1 #include "Array-util.h" #include "mx-ops.h"
--- a/liboctave/operators/Sparse-perm-op-defs.h +++ b/liboctave/operators/Sparse-perm-op-defs.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_sparse_perm_op_defs_h) -#define octave_sparse_perm_op_defs_h 1 +#if !defined (octave_Sparse_perm_op_defs_h) +#define octave_Sparse_perm_op_defs_h 1 // Matrix multiplication @@ -169,4 +169,4 @@ return octinternal_do_mul_sm_colpm (a, p.pvec ().data ()); } -#endif // octave_sparse_perm_op_defs_h +#endif // octave_Sparse_perm_op_defs_h
--- a/liboctave/system/lo-sysdep.h +++ b/liboctave/system/lo-sysdep.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_liboctave_sysdep_h) -#define octave_liboctave_sysdep_h 1 +#if !defined (octave_lo_sysdep_h) +#define octave_lo_sysdep_h 1 #include <string>
--- a/liboctave/system/oct-env.h +++ b/liboctave/system/oct-env.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_env_h) -#define octave_env_h 1 +#if !defined (octave_oct_env_h) +#define octave_oct_env_h 1 #include <string>
--- a/liboctave/system/oct-group.h +++ b/liboctave/system/oct-group.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_group_h) -#define octave_group_h 1 +#if !defined (octave_oct_group_h) +#define octave_oct_group_h 1 #include <string>
--- a/liboctave/system/oct-openmp.h +++ b/liboctave/system/oct-openmp.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_openmp_h) -#define octave_openmp_h 1 +#if !defined (octave_oct_openmp_h) +#define octave_oct_openmp_h 1 /* A macro to make using OpenMP easier, and easier to disable */ #ifdef HAVE_OPENMP
--- a/liboctave/system/oct-passwd.h +++ b/liboctave/system/oct-passwd.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_passwd_h) -#define octave_passwd_h 1 +#if !defined (octave_oct_passwd_h) +#define octave_oct_passwd_h 1 #include <string>
--- a/liboctave/system/oct-syscalls.h +++ b/liboctave/system/oct-syscalls.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_syscalls_h) -#define octave_syscalls_h 1 +#if !defined (octave_oct_syscalls_h) +#define octave_oct_syscalls_h 1 #include <string>
--- a/liboctave/system/oct-time.h +++ b/liboctave/system/oct-time.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_time_h) -#define octave_time_h 1 +#if !defined (octave_oct_time_h) +#define octave_oct_time_h 1 #include <ctime> #include <string>
--- a/liboctave/system/oct-uname.h +++ b/liboctave/system/oct-uname.h @@ -20,7 +20,7 @@ */ -#if !defined (octave_uame_h) +#if !defined (octave_oct_uname_h) #define octave_uname_h 1 #include <string>
--- a/liboctave/util/lo-array-gripes.h +++ b/liboctave/util/lo-array-gripes.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_liboctave_array_gripes_h) -#define octave_liboctave_array_gripes_h 1 +#if !defined (octave_lo_array_gripes_h) +#define octave_lo_array_gripes_h 1 #include "dim-vector.h"
--- a/liboctave/util/lo-cutils.h +++ b/liboctave/util/lo-cutils.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_liboctave_cutils_h) -#define octave_liboctave_cutils_h 1 +#if !defined (octave_lo_cutils_h) +#define octave_lo_cutils_h 1 #include <sys/types.h>
--- a/liboctave/util/lo-ieee.h +++ b/liboctave/util/lo-ieee.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_liboctave_ieee_h) -#define octave_liboctave_ieee_h 1 +#if !defined (octave_lo_ieee_h) +#define octave_lo_ieee_h 1 #ifdef __cplusplus extern "C" {
--- a/liboctave/util/lo-macros.h +++ b/liboctave/util/lo-macros.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_liboctave_macros_h) -#define octave_liboctave_macros_h 1 +#if !defined (octave_lo_macros_h) +#define octave_lo_macros_h 1 // Core macros. Iteration is supported up to count 10.
--- a/liboctave/util/lo-math.h +++ b/liboctave/util/lo-math.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_liboctave_math_h) -#define octave_liboctave_math_h 1 +#if !defined (octave_lo_math_h) +#define octave_lo_math_h 1 #if defined (__cplusplus) #include <cmath>
--- a/liboctave/util/lo-regexp.h +++ b/liboctave/util/lo-regexp.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_liboctave_regexp_match_h) -#define octave_liboctave_regexp_match_h 1 +#if !defined (octave_lo_regexp_h) +#define octave_lo_regexp_h 1 #include <list> #include <sstream>
--- a/liboctave/util/lo-traits.h +++ b/liboctave/util/lo-traits.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_liboctave_traits_h) -#define octave_liboctave_traits_h 1 +#if !defined (octave_lo_traits_h) +#define octave_lo_traits_h 1 // Ideas for these classes taken from C++ Templates, The Complete // Guide by David Vandevoorde and Nicolai M. Josuttis, Addison-Wesley
--- a/liboctave/util/lo-utils.h +++ b/liboctave/util/lo-utils.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_liboctave_utils_h) -#define octave_liboctave_utils_h 1 +#if !defined (octave_lo_utils_h) +#define octave_lo_utils_h 1 #include <cstdio>
--- a/liboctave/util/oct-base64.h +++ b/liboctave/util/oct-base64.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_base64_h) -#define octave_base64_h 1 +#if !defined (octave_oct_base64_h) +#define octave_oct_base64_h 1 #include <string>
--- a/liboctave/util/oct-binmap.h +++ b/liboctave/util/oct-binmap.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_binmap_h) -#define octave_binmap_h 1 +#if !defined (octave_oct_binmap_h) +#define octave_oct_binmap_h 1 #include "Array.h" #include "Sparse.h"
--- a/liboctave/util/oct-glob.h +++ b/liboctave/util/oct-glob.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_glob_h) -#define octave_glob_h 1 +#if !defined (octave_oct_glob_h) +#define octave_oct_glob_h 1 #include "str-vec.h"
--- a/liboctave/util/oct-inttypes.h +++ b/liboctave/util/oct-inttypes.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_inttypes_h) -#define octave_inttypes_h 1 +#if !defined (octave_oct_inttypes_h) +#define octave_oct_inttypes_h 1 #include <cstdlib>
--- a/liboctave/util/oct-locbuf.h +++ b/liboctave/util/oct-locbuf.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_local_buffer_h) -#define octave_local_buffer_h 1 +#if !defined (octave_oct_locbuf_h) +#define octave_oct_locbuf_h 1 #include <cstddef> #include "oct-cmplx.h"
--- a/liboctave/util/oct-mem.h +++ b/liboctave/util/oct-mem.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_memory_h) -#define octave_memory_h 1 +#if !defined (octave_oct_mem_h) +#define octave_oct_mem_h 1 #include <cstddef> #include <cstring> @@ -157,4 +157,4 @@ DEFINE_POD_NEW_DELETE (octave_uint32) DEFINE_POD_NEW_DELETE (octave_uint64) -#endif /* octave_memory_h */ +#endif /* octave_oct_mem_h */
--- a/liboctave/util/oct-mutex.h +++ b/liboctave/util/oct-mutex.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_octave_mutex_h) -#define octave_octave_mutex_h 1 +#if !defined (octave_oct_mutex_h) +#define octave_oct_mutex_h 1 #include "oct-refcount.h"
--- a/liboctave/util/oct-refcount.h +++ b/liboctave/util/oct-refcount.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_refcount_h) -#define octave_refcount_h 1 +#if !defined (octave_oct_refcount_h) +#define octave_oct_refcount_h 1 #ifndef OCTAVE_CONFIG_INCLUDED # error "The file <octave/config.h> must be included before oct-refcount.h."
--- a/liboctave/util/oct-rl-edit.h +++ b/liboctave/util/oct-rl-edit.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_rl_edit_h) -#define octave_rl_edit_h 1 +#if !defined (octave_oct_rl_edit_h) +#define octave_oct_rl_edit_h 1 typedef int (*rl_startup_hook_fcn_ptr) (void);
--- a/liboctave/util/oct-rl-hist.h +++ b/liboctave/util/oct-rl-hist.h @@ -20,8 +20,8 @@ */ -#if !defined (octave_rl_hist_h) -#define octave_rl_hist_h 1 +#if !defined (octave_oct_rl_hist_h) +#define octave_oct_rl_hist_h 1 #ifdef __cplusplus extern "C"
--- a/liboctave/util/oct-shlib.h +++ b/liboctave/util/oct-shlib.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_shlib_h) -#define octave_shlib_h 1 +#if !defined (octave_oct_shlib_h) +#define octave_oct_shlib_h 1 #include <string> #include <map>