diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:40:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:40:15 +0000 |
| commit | 164526be645ef508b552bfcff1dec1fae13d2dfa (patch) | |
| tree | 20943ef70bb9c90e5a1ece2b2362691f9e364c4e /framework | |
| parent | 9ee090f9aebb0a06e8e1ddf67460b7f4fcaa7b6a (diff) | |
INTEGRATION: CWS ooo11rc2 (1.4.114); FILE MERGED
2003/07/15 06:22:00 fa 1.4.114.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16868
Dan
fa@ooo
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/threadhelp/transactionmanager.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/threadhelp/transactionmanager.cxx b/framework/source/threadhelp/transactionmanager.cxx index 98ab5c6757a6..9e7d8e6cea6a 100644 --- a/framework/source/threadhelp/transactionmanager.cxx +++ b/framework/source/threadhelp/transactionmanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: transactionmanager.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2002-08-19 16:08:35 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:40:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -369,7 +369,7 @@ TransactionManager& TransactionManager::getGlobalTransactionManager() if( pManager == NULL ) { // [ed] 6/16/02 Avoid static member data on OS X to work around compiler bugs -#ifdef MACOSX +#if defined(MACOSX) && (__GNUC__ < 3) // Create the new manager and set it for return on static variable. pManager = new TransactionManager(); #else |