Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed clang implicit type cast warning

  • Loading branch information...
commit 65e688db5a06f08a2f8f9f7120bfe71b0cd82d9f 1 parent 2356276
@thequux thequux authored
Showing with 8 additions and 4 deletions.
  1. +7 −3 SConstruct
  2. +1 −1  src/glue.h
View
10 SConstruct
@@ -1,8 +1,8 @@
-
+# -*- python -*-
+import os
env = Environment()
env.MergeFlags("-std=gnu99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-attributes")
-env['MODE'] = 'shared'
AddOption("--variant",
dest="variant",
@@ -24,9 +24,13 @@ if GetOption("variant") == 'debug':
env = dbg
else:
env = opt
+
+if os.getenv("CC") == "clang":
+ env.Replace(CC="clang",
+ CXX="clang++")
Export('env')
env.SConscript(["src/SConscript"], variant_dir='build/$VARIANT/src')
env.SConscript(["examples/SConscript"], variant_dir='build/$VARIANT/examples')
-env.Command('test', 'build/$VARIANT/src/test_suite', 'env LD_LIBRARY_PATH=build/$VARIANT/src $SOURCE')
+env.Command('test', 'build/$VARIANT/src/test_suite', 'env LD_LIBRARY_PATH=build/$VARIANT/src $SOURCE')
View
2  src/glue.h
@@ -182,7 +182,7 @@ HParsedToken *h_make_sint(HArena *arena, int64_t val);
HParsedToken *h_make_uint(HArena *arena, uint64_t val);
// Standard short-hands to make tokens in an action.
-#define H_MAKE(TYP, VAL) h_make(p->arena, TT_ ## TYP, VAL)
+#define H_MAKE(TYP, VAL) h_make(p->arena, (HTokenType)TT_ ## TYP, VAL)
#define H_MAKE_SEQ() h_make_seq(p->arena)
#define H_MAKE_SEQN(N) h_make_seqn(p->arena, N)
#define H_MAKE_BYTES(LEN) h_make_bytes(p->arena, LEN)
Please sign in to comment.
Something went wrong with that request. Please try again.