Mercurial > octave-nkf
view libinterp/corefcn/display.cc @ 20649:d35201e5ce5d
Fix compilation of jit broken by dd6345fd8a97 (bug #46191).
* jit-typeinfo.cc (octave_jit_compute_nelem): Use rng.numel() rather than
deprecated nelem().
* jit-typeinfo.cc (octave_jit_ginvalid_index): Call gripe_invalid_index (-1)
now that 0-argument form of function has been removed.
* jit-typeinfo.h (jit_range): Use numel() rather than nelem() for Range.
* pt-jit.cc (trip_count): Use numel() rather than nelem() for Range.
author | Rik <rik@octave.org> |
---|---|
date | Mon, 12 Oct 2015 16:08:12 -0700 |
parents | 7ac907da9fba |
children |
line wrap: on
line source
/* Copyright (C) 2009-2015 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "singleton-cleanup.h" #include "cdisplay.h" #include "display.h" #include "error.h" display_info *display_info::instance = 0; void display_info::init (bool query) { if (query) { int avail = 0; const char *msg = octave_get_display_info (&ht, &wd, &dp, &rx, &ry, &avail); dpy_avail = avail; if (msg) err_msg = msg; } } bool display_info::instance_ok (bool query) { bool retval = true; if (! instance) { instance = new display_info (query); if (instance) singleton_cleanup_list::add (cleanup_instance); } if (! instance) { error ("unable to create display_info object!"); retval = false; } return retval; }