# HG changeset patch # User Christian Kamm # Date 1225712129 -3600 # Node ID dc8b8b7ea0c1b0fb3538ccc3ebdabcdd2691022e # Parent d05fc504a3a0ed603d8676b6f2d1f6d486c0ad98 Fix compile-time warnings. Adjust include in d-asm-i386. diff -r d05fc504a3a0 -r dc8b8b7ea0c1 dmd/declaration.h --- a/dmd/declaration.h Mon Nov 03 12:25:25 2008 +0100 +++ b/dmd/declaration.h Mon Nov 03 12:35:29 2008 +0100 @@ -139,7 +139,7 @@ Declaration *isDeclaration() { return this; } // llvm - virtual void toObjFile(); // compile to .obj file + virtual void toObjFile(int unused = 0); // compile to .obj file }; /**************************************************************/ diff -r d05fc504a3a0 -r dc8b8b7ea0c1 dmd/module.c --- a/dmd/module.c Mon Nov 03 12:25:25 2008 +0100 +++ b/dmd/module.c Mon Nov 03 12:35:29 2008 +0100 @@ -613,7 +613,7 @@ } } -void Module::semantic() +void Module::semantic(Scope* unused_sc) { int i; if (semanticstarted) @@ -661,7 +661,7 @@ //printf("-Module::semantic(this = %p, '%s'): parent = %p\n", this, toChars(), parent); } -void Module::semantic2() +void Module::semantic2(Scope* unused_sc) { int i; if (deferred.dim) @@ -700,7 +700,7 @@ //printf("-Module::semantic2('%s'): parent = %p\n", toChars(), parent); } -void Module::semantic3() +void Module::semantic3(Scope* unused_sc) { int i; //printf("Module::semantic3('%s'): parent = %p\n", toChars(), parent); diff -r d05fc504a3a0 -r dc8b8b7ea0c1 dmd/module.h --- a/dmd/module.h Mon Nov 03 12:25:25 2008 +0100 +++ b/dmd/module.h Mon Nov 03 12:35:29 2008 +0100 @@ -126,9 +126,9 @@ #else void parse(); // syntactic parse #endif - void semantic(); // semantic analysis - void semantic2(); // pass 2 semantic analysis - void semantic3(); // pass 3 semantic analysis + void semantic(Scope* unused_sc = NULL); // semantic analysis + void semantic2(Scope* unused_sc = NULL); // pass 2 semantic analysis + void semantic3(Scope* unused_sc = NULL); // pass 3 semantic analysis void inlineScan(); // scan for functions to inline #ifdef _DH void genhdrfile(); // generate D import file diff -r d05fc504a3a0 -r dc8b8b7ea0c1 gen/d-asm-i386.h --- a/gen/d-asm-i386.h Mon Nov 03 12:25:25 2008 +0100 +++ b/gen/d-asm-i386.h Mon Nov 03 12:35:29 2008 +0100 @@ -1,7 +1,7 @@ // Taken from GDC source tree. Original by David Friedman. // Released under the Artistic License found in dmd/artistic.txt -#include "dmd/id.h" +#include "id.h" typedef enum { Reg_Invalid = -1, diff -r d05fc504a3a0 -r dc8b8b7ea0c1 gen/toobj.cpp --- a/gen/toobj.cpp Mon Nov 03 12:25:25 2008 +0100 +++ b/gen/toobj.cpp Mon Nov 03 12:35:29 2008 +0100 @@ -879,7 +879,7 @@ /* ================================================================== */ -void Declaration::toObjFile() +void Declaration::toObjFile(int unused) { Logger::println("Ignoring Declaration::toObjFile for %s", toChars()); }