Merge pull request bhelyer#4 from simendsjo/master

Remove warning
jaydg · Feb 21, 2012 · 223fd7e · 223fd7e
2 parents f88e09f + ba0d223
commit 223fd7e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,7 @@
 # Gnu make Makefile for libtcod-d
+
+DMD = dmd
+
 ifeq ""      '$(COMSPEC)'
 
 	Platform := Unix
@@ -31,6 +34,12 @@ endef
 $(error $(message))
 endif
 
+# For now, 32 bit is the default model
+# PS: copied from phobos
+ifeq (,$(MODEL))
+	MODEL:=32
+endif
+
 functions.d_gen := source/tcod/c/functions.d
 generated_sources := $(functions.d_gen)
 
@@ -41,7 +50,7 @@ genfuncs.d := source/genfunctionsmod.d
 function_list.txt := source/functionlist.txt
 
 $(functions.d_gen) : $(genfuncs.d) $(function_list.txt)
-	dmd -run $(genfuncs.d) \
+	$(DMD) -m$(MODEL) -run $(genfuncs.d) \
 		< $(function_list.txt) \
 		> $@
 

diff --git a/examples/makefile-d-sample b/examples/makefile-d-sample
@@ -1,5 +1,6 @@
 DMD=dmd
-DFLAGS=-gc -debug -w -unittest
+MODEL=32
+DFLAGS=-m$(MODEL) -gc -debug -w -unittest
 DLDFLAGS=-of$(EXE) -L-ldl
 EXE=samples_d
 

diff --git a/examples/samples_d.d b/examples/samples_d.d
@@ -65,7 +65,7 @@ class ColoursSample : Sample
     string name() { return "  True colors        "; }
     void render(bool first, ref TCOD_key_t key)
     {
-        enum { TOPLEFT, TOPRIGHT, BOTTOMLEFT, BOTTOMRIGHT };
+        enum { TOPLEFT, TOPRIGHT, BOTTOMLEFT, BOTTOMRIGHT }
         // Random corner colours.
         static TCOD_color_t[4] cols = [{50,40,150},{240,85,5},{50,35,240},{10,200,130}];
         static int[4] dirr = [1, -1, 1, 1], dirg = [1, -1, -1, 1], dirb = [1, 1, 1, -1];

diff --git a/source/genfunctionsmod.d b/source/genfunctionsmod.d
@@ -8,7 +8,7 @@
 module genfunctionsmod;
 
 import std.stdio;
-import std.ctype;
+import std.ascii : isWhite;
 import std.string;
 
 
@@ -115,7 +115,7 @@ bool emptyOrWhitespace(T)(T s)
 {
     bool emptyOrWhite = true;
     foreach (c; s) {
-        if (!isspace(c)) {
+        if (!isWhite(c)) {
             emptyOrWhite = false;
             break;
         }