Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(694)

Unified Diff: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc

Issue 8487001: Remove 13 exit time constructors and 3 static initializers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
index 19b0cdcbae80dc46c932769efc7936126837d93e..e56f93a3c1110b316f54c1d370cb588178a00e31 100644
--- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
+++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
@@ -409,8 +409,9 @@ void PnaclCoordinator::RunTranslate(int32_t pp_error,
namespace {
// Fake filename for the object file generated by llvm.
-const nacl::string kGeneratedObjectFileName =
- nacl::string("___PNACL_GENERATED");
+nacl::string kGeneratedObjectFileName() {
Mark Mentovai 2011/11/06 14:09:02 No longer a constant, get rid of the k.
Nico 2011/11/06 17:30:38 Done.
+ return nacl::string("___PNACL_GENERATED");
+}
string_vector LinkResources(const nacl::string& sandbox_isa,
bool withGenerated) {
@@ -419,7 +420,7 @@ string_vector LinkResources(const nacl::string& sandbox_isa,
// NOTE: order of items == link order.
if (withGenerated) {
- results.push_back(kGeneratedObjectFileName);
+ results.push_back(kGeneratedObjectFileName());
}
results.push_back(base_dir + "/libcrt_platform.a");
results.push_back(base_dir + "/libgcc.a");
@@ -512,7 +513,7 @@ void WINAPI DoLinkThread(void* arg) {
link_file + ") failed.");
}
// Also map the file name to descriptor.
- if (i->compare(kGeneratedObjectFileName) == 0) {
+ if (i->compare(kGeneratedObjectFileName()) == 0) {
SrpcParams dummy_params2;
if (!PnaclSrpcLib::InvokeSrpcMethod(browser_interface,
ld_subprocess,

Powered by Google App Engine
This is Rietveld 408576698