kiss-lang/tink_macro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/haxetink/tink_macro

Browse Source 
# Conflicts:
#	src/tink/MacroApi.hx
This commit is contained in:
Juraj Kirchheim
2016-11-05 16:27:39 +01:00
parent abbb9e5a4c 921ae162c8
commit 371f393299
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
haxelib.json
View File

@@ -11,8 +11,8 @@
"contributors": [ "contributors": [
"back2dos" "back2dos"
], ],
"releasenote": "Expand build cache for 2 and 3 type parameters.", "releasenote": "Sidestep conflict with tink_core changes.",
"version": "0.10.0", "version": "0.11.0",
"url": "http://haxetink.org/tink_macro", "url": "http://haxetink.org/tink_macro",
"dependencies": { "dependencies": {
"tink_core": "" "tink_core": ""

1
src/tink/MacroApi.hx
View File

@@ -19,7 +19,6 @@ typedef Unops = tink.macro.Ops.Unary;
typedef MacroOutcome<D, F> = tink.core.Outcome<D, F>; typedef MacroOutcome<D, F> = tink.core.Outcome<D, F>;
typedef MacroOutcomeTools = tink.OutcomeTools; typedef MacroOutcomeTools = tink.OutcomeTools;
typedef Member = tink.macro.Member; typedef Member = tink.macro.Member;
typedef Constructor = tink.macro.Constructor; typedef Constructor = tink.macro.Constructor;
typedef ClassBuilder = tink.macro.ClassBuilder; typedef ClassBuilder = tink.macro.ClassBuilder;