actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/ArchHooks/ArchHooks_Unix.cpp
+3 -3
View File
@@ -110,7 +110,7 @@ static void TestTLS()
RageThread TestThread;
TestThread.SetName( "TestTLS" );
TestThread.Create( TestTLSThread, NULL );
TestThread.Create( TestTLSThread, nullptr );
TestThread.Wait();
if( g_iTestTLS == 1 )
@@ -167,7 +167,7 @@ int64_t ArchHooks::GetMicrosecondsSinceStart( bool bAccurate )
int64_t ArchHooks::GetMicrosecondsSinceStart( bool bAccurate )
{
struct timeval tv;
gettimeofday( &tv, NULL );
gettimeofday( &tv, nullptr );
int64_t iRet = int64_t(tv.tv_sec) * 1000000 + int64_t(tv.tv_usec);
ret = FixupTimeIfBackwards( ret );
@@ -224,7 +224,7 @@ bool ArchHooks_Unix::GoToURL( RString sUrl )
else if ( p == 0 )
{
// Child
const char * const argv[] = { "xdg-open", sUrl.c_str(), NULL };
const char * const argv[] = { "xdg-open", sUrl.c_str(), nullptr };
execv( "/usr/bin/xdg-open", const_cast<char * const *>( argv ));
// If we reach here, the call to execvp failed
exit( 1 );