Merge pull request #2938 from redstar/warnings

Fix clang warnings.
dlang · Dec 9, 2013 · 6a65ae7 · 6a65ae7
2 parents 99ff220 + 2135d8e
commit 6a65ae7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/arraytypes.h b/src/arraytypes.h
@@ -24,7 +24,7 @@ typedef Array<class Expression> Expressions;
 
 typedef Array<class Statement> Statements;
 
-typedef Array<class BaseClass> BaseClasses;
+typedef Array<struct BaseClass> BaseClasses;
 
 typedef Array<class ClassDeclaration> ClassDeclarations;
 

diff --git a/src/mars.h b/src/mars.h
@@ -241,7 +241,7 @@ struct Compiler
 };
 
 typedef unsigned structalign_t;
-#define STRUCTALIGN_DEFAULT ~0  // magic value means "match whatever the underlying C compiler does"
+#define STRUCTALIGN_DEFAULT ((structalign_t) ~0)  // magic value means "match whatever the underlying C compiler does"
 // other values are all powers of 2
 
 struct Ungag