Mercurial > octave
diff libinterp/corefcn/load-save.cc @ 20945:9d9270e2f98f
eliminate comments after preprocessor conditionals
* annotation-dialog.h, gl-select.h, documentation-dock-widget.h,
files-dock-widget.h, find-files-dialog.h, find-files-model.h,
history-dock-widget.h, file-editor-interface.h, file-editor.h,
find-dialog.h, main-window.h, resource-manager.h, settings-dialog.h,
shortcut-manager.h, terminal-dock-widget.h, welcome-wizard.h,
defun-int.h, gl2ps-renderer.h, load-save.cc, ls-hdf5.cc, ls-mat5.cc,
octave-link.h, sighandlers.cc, txt-eng-ft.cc, txt-eng-ft.h,
zfstream.cc, zfstream.h, ov-cx-mat.cc, ov-cx-sparse.cc,
ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc, ov-re-mat.cc,
ov-re-sparse.cc, Sparse-diag-op-defs.h, Sparse-perm-op-defs.h,
oct-env.cc, oct-refcount.h, sparse-util.cc, statdefs.h, main.in.cc:
Eliminate comments after preprocessor conditionals.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 18 Dec 2015 22:06:22 -0500 |
| parents | 48b2ad5ee801 |
| children | 850e3d2533d4 |
line wrap: on
line diff
--- a/libinterp/corefcn/load-save.cc Fri Dec 18 17:17:24 2015 -0800 +++ b/libinterp/corefcn/load-save.cc Fri Dec 18 22:06:22 2015 -0500 @@ -303,7 +303,7 @@ // check this before we open the file if (H5Fis_hdf5 (fname.c_str ()) > 0) return LS_HDF5; -#endif /* HAVE_HDF5 */ +#endif #ifdef HAVE_ZLIB use_zlib = check_gzip_magic (fname); @@ -386,7 +386,7 @@ name = read_hdf5_data (stream, orig_fname, global, tc, doc, argv, argv_idx, argc); break; -#endif /* HAVE_HDF5 */ +#endif case LS_MAT5_BINARY: case LS_MAT7_BINARY: @@ -696,9 +696,9 @@ { #ifdef HAVE_HDF5 format = LS_HDF5; -#else /* ! HAVE_HDF5 */ +#else error ("load: octave executable was not linked with HDF5 library"); -#endif /* ! HAVE_HDF5 */ +#endif } else if (argv[i] == "-import" || argv[i] == "-i") { @@ -734,7 +734,7 @@ if (format == LS_HDF5) error ("load: cannot read HDF5 format from stdin"); else -#endif /* HAVE_HDF5 */ +#endif if (format != LS_UNKNOWN) { // FIXME: if we have already seen EOF on a previous call, @@ -779,7 +779,7 @@ gripe_file_open ("load", orig_fname); } else -#endif /* HAVE_HDF5 */ +#endif // don't insert any statements here; the "else" above has to // go with the "if" below!!!!! if (format != LS_UNKNOWN) @@ -941,7 +941,7 @@ case LS_HDF5: save_hdf5_data (os, tc, name, help, global, save_as_floats); break; -#endif /* HAVE_HDF5 */ +#endif case LS_MAT5_BINARY: save_mat5_binary_element (os, tc, name, global, false, save_as_floats); @@ -1068,9 +1068,9 @@ { #ifdef HAVE_HDF5 format = LS_HDF5; -#else /* ! HAVE_HDF5 */ +#else error ("save: octave executable was not linked with HDF5 library"); -#endif /* ! HAVE_HDF5 */ +#endif } else if (argv[i] == "-mat-binary" || argv[i] == "-mat" || argv[i] == "-m" || argv[i] == "-6" || argv[i] == "-v6" @@ -1100,9 +1100,9 @@ #ifdef HAVE_HDF5 format = LS_HDF5; save_as_floats = true; -#else /* ! HAVE_HDF5 */ +#else error ("save: octave executable was not linked with HDF5 library"); -#endif /* ! HAVE_HDF5 */ +#endif } #ifdef HAVE_ZLIB else if (argv[i] == "-zip" || argv[i] == "-z") @@ -1216,7 +1216,7 @@ #ifdef HAVE_HDF5 case LS_HDF5: -#endif /* HAVE_HDF5 */ +#endif case LS_TEXT: { octave_localtime now; @@ -1232,7 +1232,7 @@ H5Gset_comment (hs.file_id, "/", comment_string.c_str ()); } else -#endif /* HAVE_HDF5 */ +#endif os << comment_string << "\n"; } } @@ -1413,7 +1413,7 @@ fname); } else -#endif /* HAVE_HDF5 */ +#endif // don't insert any commands here! The open brace below must // go with the else above! { @@ -1618,7 +1618,7 @@ if (format == LS_HDF5) error ("save: cannot write HDF5 format to stdout"); else -#endif /* HAVE_HDF5 */ +#endif // don't insert any commands here! the brace below must go // with the "else" above! { @@ -1688,7 +1688,7 @@ } } else -#endif /* HAVE_HDF5 */ +#endif // don't insert any statements here! The brace below must go // with the "else" above! {