changeset 2009:f154d4943a1a

6916867: Fastdebug build failed after CR 4874070 fix putback. Reviewed-by: art, dcherepanov
author uta
date Thu, 14 Jan 2010 17:56:49 +0300
parents 4799006d0171
children 3cc5eff94552
files src/windows/native/sun/windows/awt_DnDDS.cpp
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_DnDDS.cpp	Wed Jan 13 17:10:23 2010 +0300
+++ b/src/windows/native/sun/windows/awt_DnDDS.cpp	Thu Jan 14 17:56:49 2010 +0300
@@ -32,15 +32,20 @@
 #pragma pop_macro("bad_alloc")
 //"bad_alloc" is undefined from here
 
+//we need to include any STL container before <awt.h> inclusion due to
+//"new" re-redefinition that is in conflict with in-place new allocator
+//applied in STL.
 #if defined(_DEBUG) || defined(DEBUG)
+    //forward declaration of "new" operator from <awt.h>
     extern void * operator new(size_t size, const char * filename, int linenumber);
+    //"new" operator definition that is consistent with re-defined
+    //in <awt.h> "delete" operator
     void * operator new(size_t size) {return operator new(size, "stl", 1);}
 #endif
+#include <map>
 
 #include <awt.h>
-#include <memory.h>
 #include <shlobj.h>
-#include <map>
 
 #include "jlong.h"
 #include "awt_DataTransferer.h"