equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
488 return (int) (legal_end - legal_start); |
488 return (int) (legal_end - legal_start); |
489 } |
489 } |
490 |
490 |
491 // VS2005 has its own definition, identical to this one. |
491 // VS2005 has its own definition, identical to this one. |
492 #if !defined(_WIN32) || defined(_WIN64) || _MSC_VER < 1400 |
492 #if !defined(_WIN32) || defined(_WIN64) || _MSC_VER < 1400 |
493 void *operator new( size_t size, int, const char *, int ) { |
493 void *operator new( size_t size, int, const char *, int ) throw() { |
494 return ::operator new( size ); |
494 return ::operator new( size ); |
495 } |
495 } |
496 #endif |
496 #endif |