Skip to content

Commit 29f5174

Browse files
committed
More merging for cleanup branch
1 parent 2250c5e commit 29f5174

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

include/clasp/gctools/memoryManagement.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct ClaspInfo {
6363
core::LispHolder *_lispHolder;
6464

6565
ClaspInfo(int argc, const char **argv, size_t stackMax)
66-
: _argc(argc), _argv(argv), _stackMax(stackMax), _lispHolder(NULL), _mpiEnabled(false), _mpiRank(0), _mpiSize(1){};
66+
: _argc(argc), _argv(argv), _stackMax(stackMax), _mpiEnabled(false), _mpiRank(0), _mpiSize(1), _lispHolder(NULL){};
6767
};
6868
}; // namespace gctools
6969

@@ -755,7 +755,7 @@ class Header_s : public BaseHeader_s {
755755
};
756756

757757
Header_s(Header_s *headerptr)
758-
: BaseHeader_s(headerptr->_badge_stamp_wtag_mtag), _guard(GUARD1), _tail_start(0), _tail_size(0), _source(headerptr->_source),
758+
: BaseHeader_s(headerptr->_badge_stamp_wtag_mtag), _tail_start(0), _tail_size(0), _guard(GUARD1), _source(headerptr->_source),
759759
_guard2(GUARD2), _dup_badge_stamp_wtag_mtag(headerptr->_badge_stamp_wtag_mtag){};
760760

761761
#endif

src/core/lispStream.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,6 +1521,11 @@ static void illegal_op_void__T_sp_char(T_sp strm, claspCharacter c) {
15211521
abort();
15221522
}
15231523

1524+
static cl_index illegal_op_vector(T_sp strm, T_sp data, cl_index start, cl_index end) {
1525+
printf("%s:%d Illegal op\n", __FILE__, __LINE__);
1526+
abort();
1527+
}
1528+
15241529
static claspCharacter illegal_op_char__T_sp(T_sp strm) {
15251530
printf("%s:%d Illegal op\n", __FILE__, __LINE__ );
15261531
abort();

0 commit comments

Comments
 (0)