# HG changeset patch
# User Frits van Bommel <fvbommel wxs.nl>
# Date 1241087104 -7200
# Node ID 29d3861aa2da3d82f43de41eaab28b334f2b6eb6
# Parent  00a307a393f2b7ec9a34ece0001663b04076bcc8
Make sure this still compiles after LLVM r70437, which introduces a
specialization for command-line option template parser<char> which does the
wrong thing for us...

diff -r 00a307a393f2 -r 29d3861aa2da dmd/mars.h
--- a/dmd/mars.h	Thu Apr 30 11:56:03 2009 +0200
+++ b/dmd/mars.h	Thu Apr 30 12:25:04 2009 +0200
@@ -133,13 +133,15 @@
     OSSolaris,
 };
 
+typedef unsigned char ubyte;
+
 // Put command line switches in here
 struct Param
 {
     bool obj;           // write object file
     bool link;          // perform link
     bool verbose;       // verbose compile
-    char symdebug;	// insert debug symbolic information
+    ubyte symdebug;	// insert debug symbolic information
 #if !IN_LLVM
     // LDC uses a different mechanism
     bool optimize;      // run optimizer
@@ -159,7 +161,7 @@
     bool useUnitTests;  // generate unittest code
     bool useInline;     // inline expand functions
     bool warnings;      // enable warnings
-    char Dversion;	// D version number
+    ubyte Dversion;	// D version number
     char safe;		// enforce safe memory model
 
     char *argv0;	// program name
diff -r 00a307a393f2 -r 29d3861aa2da gen/cl_options.cpp
--- a/gen/cl_options.cpp	Thu Apr 30 11:56:03 2009 +0200
+++ b/gen/cl_options.cpp	Thu Apr 30 12:25:04 2009 +0200
@@ -25,7 +25,7 @@
     cl::ZeroOrMore,
     cl::location(global.params.useDeprecated));
 
-static cl::opt<char, true> useDv1(
+static cl::opt<ubyte, true> useDv1(
     cl::desc("Force language version:"),
     cl::ZeroOrMore,
     cl::values(
@@ -49,7 +49,7 @@
     cl::ZeroOrMore,
     cl::location(global.params.warnings));
 
-static cl::opt<char, true> debugInfo(
+static cl::opt<ubyte, true> debugInfo(
     cl::desc("Generating debug information:"),
     cl::ZeroOrMore,
     cl::values(
diff -r 00a307a393f2 -r 29d3861aa2da gen/optimizer.cpp
--- a/gen/optimizer.cpp	Thu Apr 30 11:56:03 2009 +0200
+++ b/gen/optimizer.cpp	Thu Apr 30 12:25:04 2009 +0200
@@ -21,7 +21,7 @@
         cl::Hidden      // to clean up --help output
     );
 
-static cl::opt<char> optimizeLevel(
+static cl::opt<unsigned char> optimizeLevel(
     cl::desc("Setting the optimization level:"),
     cl::ZeroOrMore,
     cl::values(