firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 18:03:04 +01:00
Code Issues

- Make MinGW build again after Nickolay patch (There is a multiple definition of std::bad_alloc::~bad_alloc())

Browse Source
This commit is contained in:
brodsom 2003-11-03 02:05:14 +00:00
parent e2b976500f
commit 51893d72ad
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/classes/alloc.cpp
View File

@ -32,7 +32,7 @@
* Contributor(s):
*
*
* $Id: alloc.cpp,v 1.33 2003-10-27 22:27:26 skidder Exp $
* $Id: alloc.cpp,v 1.34 2003-11-03 02:05:14 brodsom Exp $
*
*/
@ -646,7 +646,7 @@ Firebird::MemoryPool* getDefaultMemoryPool() {
return Firebird::processMemoryPool;
}
#ifndef __GNUC__
#if !defined(__GNUC__) || defined(MINGW)
void* operator new(size_t s) THROW_BAD_ALLOC {
#if defined(DEV_BUILD)

5
src/common/classes/alloc.h
View File

@ -34,7 +34,7 @@
* Contributor(s):
*
*
* $Id: alloc.h,v 1.27 2003-10-27 22:27:26 skidder Exp $
* $Id: alloc.h,v 1.28 2003-11-03 02:05:14 brodsom Exp $
*
*/
@ -42,6 +42,7 @@
#define ALLOC_H
#include <cstddef>
#include "../../include/fb_types.h"
#include "../../include/firebird.h"
#include "../jrd/common.h"
@ -244,7 +245,7 @@ using Firebird::MemoryPool;
MemoryPool* getDefaultMemoryPool();
#ifdef __GNUC__
#if defined(__GNUC__) && !defined(MINGW)
// All this crappy code below under __GNUC__ conditional is to avoid replacing
// STL operator new as this replacement causes crashes if client library is
// loaded by host application using STL

4
src/common/classes/tree.h
View File

@ -32,7 +32,7 @@
* Contributor(s):
*
*
* $Id: tree.h,v 1.20 2003-10-27 22:27:26 skidder Exp $
* $Id: tree.h,v 1.21 2003-11-03 02:05:13 brodsom Exp $
*
*/
@ -46,7 +46,7 @@
stdlib.h (EKU) */
#endif
#include "vector.h"
#ifndef __GNUC__
#if !defined(__GNUC__) || defined(MINGW)
#include <new>
#endif

4
src/include/firebird.h
View File

@ -30,7 +30,7 @@
* John Bellardo <bellardo@cs.ucsd.edu>
*
*
* $Id: firebird.h,v 1.15 2003-10-27 22:27:29 skidder Exp $
* $Id: firebird.h,v 1.16 2003-11-03 02:05:09 brodsom Exp $
*
*/
@ -75,7 +75,7 @@
#define NULL 0L
#endif
#if defined __cplusplus && defined __GNUC__
#if defined __cplusplus && (defined __GNUC__ && !defined(MINGW))
#include "../common/classes/alloc.h"
#endif