Add using std::nothrow; to core.h

livecodefraser · peter-b · commit 516971fa97c0 · 2016-10-03T16:21:28.000+01:00
All uses of new now consistently use (nothrow) as the placement
parameter instead of mixing it with (std::nothrow).
diff --git a/libbrowser/src/libbrowser.cpp b/libbrowser/src/libbrowser.cpp
@@ -16,7 +16,6 @@
 
 #include <core.h>
 
-#include <new>
 #include <stdlib.h>
 #include <memory.h>
 
@@ -465,7 +464,7 @@ bool MCBrowserSetRequestHandler(MCBrowserRef p_browser, MCBrowserRequestCallback
 	}
 	
 	MCBrowserEventHandlerWrapper *t_wrapper;
-	t_wrapper = new (std::nothrow) MCBrowserEventHandlerWrapper(p_callback, p_context);
+	t_wrapper = new (nothrow) MCBrowserEventHandlerWrapper(p_callback, p_context);
 	
 	if (t_wrapper == nil)
 		return false;
@@ -510,7 +509,7 @@ bool MCBrowserSetJavaScriptHandler(MCBrowserRef p_browser, MCBrowserJavaScriptCa
 	}
 	
 	MCBrowserJavaScriptHandlerWrapper *t_wrapper;
-	t_wrapper = new (std::nothrow) MCBrowserJavaScriptHandlerWrapper(p_callback, p_context);
+	t_wrapper = new (nothrow) MCBrowserJavaScriptHandlerWrapper(p_callback, p_context);
 	
 	if (t_wrapper == nil)
 		return false;
diff --git a/libbrowser/src/libbrowser_value.cpp b/libbrowser/src/libbrowser_value.cpp
@@ -414,7 +414,7 @@ MC_BROWSER_DLLEXPORT_DEF
 bool MCBrowserListCreate(MCBrowserListRef &r_browser, uint32_t p_size)
 {
 	MCBrowserList *t_browser;
-	t_browser = new (std::nothrow) MCBrowserList();
+	t_browser = new (nothrow) MCBrowserList();
 	if (t_browser == nil)
 		return false;
 	
@@ -878,7 +878,7 @@ MC_BROWSER_DLLEXPORT_DEF
 bool MCBrowserDictionaryCreate(MCBrowserDictionaryRef &r_dict, uint32_t p_size)
 {
 	MCBrowserDictionary *t_dict;
-	t_dict = new (std::nothrow) MCBrowserDictionary();
+	t_dict = new (nothrow) MCBrowserDictionary();
 	if (t_dict == nil)
 		return false;
 	
diff --git a/libcore/include/core.h b/libcore/include/core.h
@@ -282,6 +282,7 @@ void MCMemoryDelete(void *p_record);
 //////////
 
 #include <new>
+using std::nothrow;
 
 // This method provides type-safe construction of an object.
 template<typename T> bool MCMemoryNew(T*& r_record)
diff --git a/revbrowser/src/revbrowser.cpp b/revbrowser/src/revbrowser.cpp
@@ -151,7 +151,7 @@ bool BrowserInstances::FindInstanceById(int p_id, BrowserInstance *&r_instance)
 void BrowserInstances::Add(CWebBrowserBase *p_browser, bool p_is_xbrowser)
 {
 	BrowserInstance *t_instance;
-	t_instance = new (std::nothrow) BrowserInstance;
+	t_instance = new (nothrow) BrowserInstance;
 	t_instance -> next = m_instances;
 	t_instance -> instance_id = ++m_last_instance_id;
 	t_instance -> stack_id = NULL;
diff --git a/revvideograbber/src/revvideograbber.cpp b/revvideograbber/src/revvideograbber.cpp
@@ -115,7 +115,7 @@ struct MYBITMAP
 
 MYBITMAP *createmybitmap(uint2 depth, uint2 width, uint2 height)
 {
-  MYBITMAP *image = new (std::nothrow) MYBITMAP;
+  MYBITMAP *image = new (nothrow) MYBITMAP;
   image->width = width;
   image->height = height;
   image->depth = (uint1)depth;
@@ -638,7 +638,7 @@ void REVVideoGrabber(VideoGrabberKeyword whichkeyword,
 				{
 #endif
                     if (InitQT())
-                        gvideograbber = new (std::nothrow) CQTVideoGrabber(windowid);
+                        gvideograbber = new (nothrow) CQTVideoGrabber(windowid);
                     else
                     {
                         // SN-2015-04-17: [[ Bug 13452 ]] Break if qvideograbber

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ bool BrowserInstances::FindInstanceById(int p_id, BrowserInstance *&r_instance)`
`151`	`151`	`void BrowserInstances::Add(CWebBrowserBase *p_browser, bool p_is_xbrowser)`
`152`	`152`	`{`
`153`	`153`	`BrowserInstance *t_instance;`
`154`		`- t_instance = new (std::nothrow) BrowserInstance;`
	`154`	`+ t_instance = new (nothrow) BrowserInstance;`
`155`	`155`	`t_instance -> next = m_instances;`
`156`	`156`	`t_instance -> instance_id = ++m_last_instance_id;`
`157`	`157`	`t_instance -> stack_id = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ struct MYBITMAP`
`115`	`115`
`116`	`116`	`MYBITMAP *createmybitmap(uint2 depth, uint2 width, uint2 height)`
`117`	`117`	`{`
`118`		`- MYBITMAP *image = new (std::nothrow) MYBITMAP;`
	`118`	`+ MYBITMAP *image = new (nothrow) MYBITMAP;`
`119`	`119`	`image->width = width;`
`120`	`120`	`image->height = height;`
`121`	`121`	`image->depth = (uint1)depth;`
`@@ -638,7 +638,7 @@ void REVVideoGrabber(VideoGrabberKeyword whichkeyword,`
`638`	`638`	`{`
`639`	`639`	`#endif`
`640`	`640`	`if (InitQT())`
`641`		`- gvideograbber = new (std::nothrow) CQTVideoGrabber(windowid);`
	`641`	`+ gvideograbber = new (nothrow) CQTVideoGrabber(windowid);`
`642`	`642`	`else`
`643`	`643`	`{`
`644`	`644`	`// SN-2015-04-17: [[ Bug 13452 ]] Break if qvideograbber`