Bug 1287653 - Use std::string::c_str instead of &std::string[0] to get a c-string. - r=mtseng draft
authorJeff Gilbert <jgilbert@mozilla.com>
Sun, 17 Jul 2016 14:21:00 -0700
changeset 394099 b059b5c87f2c7a0b50353594fffd9f25dcaa5526
parent 394098 ee29afa8a7166139cad7bb458d7ac21e7443ef7f
child 394100 aac9c7f4879ff409e49ea12d8bf37e0823b8811b
push id24492
push userbmo:jgilbert@mozilla.com
push dateFri, 29 Jul 2016 03:02:43 +0000
reviewersmtseng
bugs1287653
milestone50.0a1
Bug 1287653 - Use std::string::c_str instead of &std::string[0] to get a c-string. - r=mtseng MozReview-Commit-ID: AsBaqtyQ8Ca
gfx/gl/GLContextProviderWGL.cpp
--- a/gfx/gl/GLContextProviderWGL.cpp
+++ b/gfx/gl/GLContextProviderWGL.cpp
@@ -103,17 +103,17 @@ WGLLibrary::EnsureInitialized()
 
     std::string libGLFilename = "Opengl32.dll";
     // SU_SPIES_DIRECTORY is for AMD CodeXL/gDEBugger
     if (PR_GetEnv("SU_SPIES_DIRECTORY")) {
         libGLFilename = std::string(PR_GetEnv("SU_SPIES_DIRECTORY")) + "\\opengl32.dll";
     }
 
     if (!mOGLLibrary) {
-        mOGLLibrary = PR_LoadLibrary(&libGLFilename[0]);
+        mOGLLibrary = PR_LoadLibrary(libGLFilename.c_str());
         if (!mOGLLibrary) {
             NS_WARNING("Couldn't load OpenGL library.");
             return false;
         }
     }
 
     GLLibraryLoader::SymLoadStruct earlySymbols[] = {
         { (PRFuncPtr*) &fCreateContext, { "wglCreateContext", nullptr } },