commit 96a1ceb171cf9f383f9af032886a1c205b733c4c
author Nicolas Capens <capn@google.com> Tue Sep 25 11:46:27 2018 -0400
committer Nicolas Capens <nicolascapens@google.com> Wed Sep 26 16:33:07 2018 +0000
tree 1661b790c009529ae144882440448f0617023f58
parent d73b871379e066a4e3fc296885dc96bdf2e75ac2

Remove exit-time destructors.

Bug chromium:101600
Bug swiftshader:118

Change-Id: Id167a84c4d8781989d4d903384c4e6fe6f45fb85
Reviewed-on: https://swiftshader-review.googlesource.com/20868
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/OpenGL/compiler/DirectiveHandler.cpp

diff --git a/src/OpenGL/compiler/DirectiveHandler.cpp b/src/OpenGL/compiler/DirectiveHandler.cpp
index ef61d47..7616ce5 100644
--- a/src/OpenGL/compiler/DirectiveHandler.cpp
+++ b/src/OpenGL/compiler/DirectiveHandler.cpp
@@ -21,10 +21,10 @@
 
 static TBehavior getBehavior(const std::string& str)
 {
-	static const std::string kRequire("require");
-	static const std::string kEnable("enable");
-	static const std::string kDisable("disable");
-	static const std::string kWarn("warn");
+	static const char kRequire[] = "require";
+	static const char kEnable[] = "enable";
+	static const char kDisable[] = "disable";
+	static const char kWarn[] = "warn";
 
 	if (str == kRequire) return EBhRequire;
 	else if (str == kEnable) return EBhEnable;
@@ -57,11 +57,11 @@
                                      const std::string& value,
                                      bool stdgl)
 {
-	static const std::string kSTDGL("STDGL");
-	static const std::string kOptimize("optimize");
-	static const std::string kDebug("debug");
-	static const std::string kOn("on");
-	static const std::string kOff("off");
+	static const char kSTDGL[] = "STDGL";
+	static const char kOptimize[] = "optimize";
+	static const char kDebug[] = "debug";
+	static const char kOn[] = "on";
+	static const char kOff[] = "off";
 
 	bool invalidValue = false;
 	if (stdgl || (name == kSTDGL))
@@ -98,7 +98,7 @@
                                         const std::string& name,
                                         const std::string& behavior)
 {
-	static const std::string kExtAll("all");
+	static const char kExtAll[] = "all";
 
 	TBehavior behaviorVal = getBehavior(behavior);
 	if (behaviorVal == EBhUndefined)