Mercurial > octave
comparison libinterp/corefcn/symtab.cc @ 21573:f3f8e1d3e399 stable
avoid mulitple definitions of static function-scope vars (bug #47372)
Some systems (Windows, others?) may generate multiple definitions of
function-scope static variables if those functions appear in header
files. This can cause trouble in various ways. Attempt to avoid the
problem by moving functions that contain file-scope varaibles from
header files to source files, or by using class-scope static variables
instead. Also attempt to avoid similar problems caused by implicit
instantiations of templates that have functions with static variables.
* Cell.h, Cell.cc (Cell::resize_fill_value):
Move definition from header to source file.
* oct-map.h, oct-map.cc (octave_fields::nil_rep): Likewise.
* ov-base-scalar.h, ov-base-scalar.cc (octave_base_scalar<ST>::dims):
Likewise.
* ov-fcn-handle.h, ov-fcn-handle.cc (octave_fcn_handle::dims): Likewise.
* ov.h, ov.cc (octave_value::nil_rep): Likewise.
* Array.h, Array.cc (Array<T>::nil_rep): Likewise.
* DiagArray2.h, DiagArray2.cc (DiagArray2<T>::elem,
DiagArray2<T>::checkelem): Likewise.
* Sparse.h, Sparse.cc (Sparse<T>::nil_rep): Likewise.
* dim-vector.h, dim-vector.cc (dim_vector::nil_rep): Likewise.
* idx-vector.h, idx-vector.cc (idx_vector::nil_rep,
idx_vector::err_rep): Likewise.
* oct-inttypes.h, oct-inttypes.cc (octave_int_base<T>::convert_real):
Likewise.
* symtab.h, symtab.cc (octave_value symbol_table::dummy_octave_value,
symbol_table::symbol_record symbol_table::dummy_symbol_record): New
class-scope static variables. Use them to eliminate function-scope
static variables.
* ov-int8.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-uint8.cc,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-scalar.cc,
ov-flt-complex.cc, ov-complex.cc, ov-classdef.cc, ov-bool.cc,
Array-jit.cc, Array-os.cc, Array-tc.cc, Array-C.cc, Array-b.cc,
Array-ch.cc, Array-d.cc, Array-f.cc, Array-fC.cc, Array-i.cc,
Array-idx-vec.cc, Array-s.cc, Array-str.cc, Array-voidp.cc:
Prevent impliticit template instantiation.
* Array-tc.cc: Also instantiate Array<cdef_object>.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 01 Apr 2016 12:04:04 -0400 |
| parents | 4f45eaf83908 |
| children | ae4d7dfea337 |
comparison
equal
deleted
inserted
replaced
| 21572:8fc45dd1cac6 | 21573:f3f8e1d3e399 |
|---|---|
| 46 #include "pt-arg-list.h" | 46 #include "pt-arg-list.h" |
| 47 #include "symtab.h" | 47 #include "symtab.h" |
| 48 #include "unwind-prot.h" | 48 #include "unwind-prot.h" |
| 49 #include "utils.h" | 49 #include "utils.h" |
| 50 | 50 |
| 51 octave_value symbol_table::dummy_octave_value; | |
| 52 | |
| 51 symbol_table *symbol_table::instance = 0; | 53 symbol_table *symbol_table::instance = 0; |
| 52 | 54 |
| 53 symbol_table::scope_id_cache *symbol_table::scope_id_cache::instance = 0; | 55 symbol_table::scope_id_cache *symbol_table::scope_id_cache::instance = 0; |
| 54 | 56 |
| 55 std::map<symbol_table::scope_id, symbol_table*> symbol_table::all_instances; | 57 std::map<symbol_table::scope_id, symbol_table*> symbol_table::all_instances; |
| 147 } | 149 } |
| 148 } | 150 } |
| 149 | 151 |
| 150 return retval; | 152 return retval; |
| 151 } | 153 } |
| 154 | |
| 155 symbol_table::symbol_record symbol_table::dummy_symbol_record; | |
| 152 | 156 |
| 153 static void | 157 static void |
| 154 split_name_with_package (const std::string& name, std::string& fname, | 158 split_name_with_package (const std::string& name, std::string& fname, |
| 155 std::string& pname) | 159 std::string& pname) |
| 156 { | 160 { |