Attachment #347462 for bug #466628

View | Details | Raw Unified | Return to bug 466628
Collapse All | Expand All

Lines 254-264 Link Here

(-)grass.orig/lib/iostream/mm.cc (-4 / +4 lines)
254	}	254	}
255		255
256		256
257		257
258	/* ************************************************************ */	258	/* ************************************************************ */
259	void* operator new[] (size_t sz) {	259	void* operator new[] (size_t sz) throw(std::bad_alloc) {
260	void *p;	260	void *p;
261		261
262	MM_DEBUG cout << "new: sz=" << sz << ", register "	262	MM_DEBUG cout << "new: sz=" << sz << ", register "
263	<< sz+SIZE_SPACE << "B ,";	263	<< sz+SIZE_SPACE << "B ,";
264		264
Lines 305-315 Link Here
305	}	305	}
306		306
307		307
308		308
309	/* ************************************************************ */	309	/* ************************************************************ */
310	void* operator new (size_t sz) {	310	void* operator new (size_t sz) throw(std::bad_alloc) {
311	void *p;	311	void *p;
312		312
313	MM_DEBUG cout << "new: sz=" << sz << ", register "	313	MM_DEBUG cout << "new: sz=" << sz << ", register "
314	<< sz+SIZE_SPACE << "B ,";	314	<< sz+SIZE_SPACE << "B ,";
315		315
Lines 357-367 Link Here
357		357
358		358
359		359
360		360
361	/* ---------------------------------------------------------------------- */	361	/* ---------------------------------------------------------------------- */
362	void operator delete (void *ptr) {	362	void operator delete (void *ptr) throw() {
363	size_t sz;	363	size_t sz;
364	void *p;	364	void *p;
365		365
366	MM_DEBUG cout << "delete: ptr=" << ptr << ",";	366	MM_DEBUG cout << "delete: ptr=" << ptr << ",";
367		367
Lines 397-407 Link Here
397		397
398		398
399		399
400		400
401	/* ---------------------------------------------------------------------- */	401	/* ---------------------------------------------------------------------- */
402	void operator delete[] (void *ptr) {	402	void operator delete[] (void *ptr) throw() {
403	size_t sz;	403	size_t sz;
404	void *p;	404	void *p;
405		405
406	MM_DEBUG cout << "delete[]: ptr=" << ptr << ",";	406	MM_DEBUG cout << "delete[]: ptr=" << ptr << ",";
407		407




  int    space_overhead ();          
 
  void print();

  friend class mm_register_init;
  friend void * operator new(size_t) throw(std::bad_alloc);
  friend void * operator new[](size_t) throw(std::bad_alloc);
  friend void operator delete(void *) throw();
  friend void operator delete[](void *) throw();
};








HeapIndex MinMaxHeap<T>::fill(T* arr, HeapIndex n) {
  HeapIndex i;
  //heap must be empty
  assert(this->size()==0);
  for (i = 0; !full() && i<n; i++) {
    this->insert(arr[i]);
  }
  if (i < n) {
    assert(i == this->maxsize);
    return n - i;
  } else {


  assert(this->maxsize > 0);

  if(old) {
	HeapIndex n = this->size();
	this->A = this->allocateHeap(this->maxsize);  /* allocate a new array */
	/* copy over the old values */
	assert(this->maxsize > n);
	for(HeapIndex i=0; i<=n; i++) {	/* why extra value? -RW */
	  this->A[i] = old[i];
	}	
	this->freeHeap(old);			/* free up old storage */
  }

}



Return to bug 466628

Lines 108-121 Link Here

(-)grass.orig/include/iostream/mm.h (-4 / +4 lines)
108	int space_overhead ();	108	int space_overhead ();
109		109
110	void print();	110	void print();
111		111
112	friend class mm_register_init;	112	friend class mm_register_init;
113	friend void * operator new(size_t);	113	friend void * operator new(size_t) throw(std::bad_alloc);
114	friend void * operator new[](size_t);	114	friend void * operator new[](size_t) throw(std::bad_alloc);
115	friend void operator delete(void *);	115	friend void operator delete(void *) throw();
116	friend void operator delete[](void *);	116	friend void operator delete[](void *) throw();
117	};	117	};
118		118
119		119
120		120
121		121

Lines 742-752 Link Here

(-)grass.orig/include/iostream/minmaxheap.h (-3 / +3 lines)
742	HeapIndex MinMaxHeap<T>::fill(T* arr, HeapIndex n) {	742	HeapIndex MinMaxHeap<T>::fill(T* arr, HeapIndex n) {
743	HeapIndex i;	743	HeapIndex i;
744	//heap must be empty	744	//heap must be empty
745	assert(this->size()==0);	745	assert(this->size()==0);
746	for (i = 0; !full() && i<n; i++) {	746	for (i = 0; !full() && i<n; i++) {
747	insert(arr[i]);	747	this->insert(arr[i]);
748	}	748	}
749	if (i < n) {	749	if (i < n) {
750	assert(i == this->maxsize);	750	assert(i == this->maxsize);
751	return n - i;	751	return n - i;
752	} else {	752	} else {
Lines 775-791 Link Here
775		775
776	assert(this->maxsize > 0);	776	assert(this->maxsize > 0);
777		777
778	if(old) {	778	if(old) {
779	HeapIndex n = this->size();	779	HeapIndex n = this->size();
780	this->A = allocateHeap(this->maxsize); /* allocate a new array */	780	this->A = this->allocateHeap(this->maxsize); /* allocate a new array */
781	/* copy over the old values */	781	/* copy over the old values */
782	assert(this->maxsize > n);	782	assert(this->maxsize > n);
783	for(HeapIndex i=0; i<=n; i++) { /* why extra value? -RW */	783	for(HeapIndex i=0; i<=n; i++) { /* why extra value? -RW */
784	this->A[i] = old[i];	784	this->A[i] = old[i];
785	}	785	}
786	freeHeap(old); /* free up old storage */	786	this->freeHeap(old); /* free up old storage */
787	}	787	}
788		788
789	}	789	}
790		790
791		791