diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2015-10-27 06:51:51 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2015-10-27 06:51:51 -0700 |
commit | a7f752540226e033c061be107a623a0563f68031 (patch) | |
tree | 110c340fe30d4e35f6f5ea2161532284b73225dd /struct.c | |
parent | 0faa7cf4c73cc7c95488ed3055dd3c693dd341bc (diff) | |
download | txr-a7f752540226e033c061be107a623a0563f68031.tar.gz txr-a7f752540226e033c061be107a623a0563f68031.tar.bz2 txr-a7f752540226e033c061be107a623a0563f68031.zip |
Fix C++ clash in slots implementation.
* struct.c (make_struct_type): Don't use nullptr identifier
as variable name.
Diffstat (limited to 'struct.c')
-rw-r--r-- | struct.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -224,7 +224,7 @@ val make_struct_type(val name, val super, val id = num_fast(++struct_id_counter); val iter; cnum sl, stsl; - val nullptr = 0; + val null_ptr = 0; st->name = name; st->id = c_num(id); @@ -262,7 +262,7 @@ val make_struct_type(val name, val super, stsl -= STATIC_SLOT_BASE; st->stslot = coerce(val *, chk_manage_vec(0, 0, stsl, sizeof (val), - coerce(mem_t *, &nullptr))); + coerce(mem_t *, &null_ptr))); st->nslots = sl; st->nstslots = stsl; |