From fca550e534eefc505e28485591e5d4b77bc36453 Mon Sep 17 00:00:00 2001
From: David Nadlinger <code@klickverbot.at>
Date: Thu, 20 Dec 2012 00:30:34 +0100
Subject: [PATCH] Cleanup: Remove warning overrides and fix two more warnings.

---
 CMakeLists.txt  | 2 +-
 driver/main.cpp | 2 +-
 gen/toir.cpp    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d055f2dc..455c0707 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,7 +267,7 @@ endif()
 if(MSVC)
     set(EXTRA_CXXFLAGS "/W0 /wd4996 /GF /GR- /RTC1")
 else()
-    set(EXTRA_CXXFLAGS "-Wno-deprecated -Wno-write-strings -fexceptions")
+    set(EXTRA_CXXFLAGS "-fexceptions")
 endif()
 
 #
diff --git a/driver/main.cpp b/driver/main.cpp
index 0af27ca2..9ca421ef 100644
--- a/driver/main.cpp
+++ b/driver/main.cpp
@@ -108,7 +108,7 @@ void printVersion() {
 }
 
 // Helper function to handle -d-debug=* and -d-version=*
-static void processVersions(std::vector<std::string>& list, char* type,
+static void processVersions(std::vector<std::string>& list, const char* type,
         void (*setLevel)(unsigned), void (*addIdent)(const char*)) {
     typedef std::vector<std::string>::iterator It;
 
diff --git a/gen/toir.cpp b/gen/toir.cpp
index 8f80e39c..c4c8688e 100644
--- a/gen/toir.cpp
+++ b/gen/toir.cpp
@@ -1049,7 +1049,7 @@ DValue* CallExp::toElem(IRState* p)
                 return NULL;
             }
 
-            static char *ops[] = {
+            static const char *ops[] = {
                 "xchg",
                 "add",
                 "sub",