diff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-23 17:55:40 (GMT) | 
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-12-23 18:33:39 (GMT) | 
| commit | 40c9a08061f285cbc4754bc135539d46c70e02e9 (patch) | |
| tree | 3858912fb2238c656dcec2acbc46ca28cc2c10a2 /SwifTools/CrashReporter.cpp | |
| parent | feab54913e13c9a1af999039d473fce75d39be1b (diff) | |
| download | swift-40c9a08061f285cbc4754bc135539d46c70e02e9.zip swift-40c9a08061f285cbc4754bc135539d46c70e02e9.tar.bz2 | |
Fix compilation of CrashReporter.
Change-Id: I7440eedcf6304ff142029324450af35a5b9606f0
Diffstat (limited to 'SwifTools/CrashReporter.cpp')
| -rw-r--r-- | SwifTools/CrashReporter.cpp | 14 | 
1 files changed, 8 insertions, 6 deletions
| diff --git a/SwifTools/CrashReporter.cpp b/SwifTools/CrashReporter.cpp index 4a07e40..42a98d8 100644 --- a/SwifTools/CrashReporter.cpp +++ b/SwifTools/CrashReporter.cpp @@ -52,12 +52,14 @@ CrashReporter::CrashReporter(const boost::filesystem::path& path) {  #if defined(SWIFTEN_PLATFORM_WINDOWS)  	// FIXME: Need UTF8 conversion from string to wstring  	std::string pathString = path.string(); -	p->handler = boost::make_shared<google_breakpad::ExceptionHandler>( -			std::wstring(pathString.begin(), pathString.end()),  -			(google_breakpad::ExceptionHandler::FilterCallback) 0,  -			handleDump,  -			(void*) 0,  -			google_breakpad::ExceptionHandler::HANDLER_ALL); +	p->handler = boost::shared_ptr<google_breakpad::ExceptionHandler>( +			// Not using make_shared, because 'handleDump' seems to have problems with VC2010 +			new google_breakpad::ExceptionHandler( +				std::wstring(pathString.begin(), pathString.end()),  +				(google_breakpad::ExceptionHandler::FilterCallback) 0,  +				handleDump,  +				(void*) 0,  +				google_breakpad::ExceptionHandler::HANDLER_ALL));  // Turning it off for Mac, because it doesn't really help us  //#elif defined(SWIFTEN_PLATFORM_MACOSX)  //	p->handler = boost::make_shared<google_breakpad::ExceptionHandler>(path.string(), (google_breakpad::ExceptionHandler::FilterCallback) 0, handleDump, (void*) 0, true, (const char*) 0); | 
 Swift
 Swift