diff options
| author | John Hodge (bugs) <tpg@mutabah.net> | 2017-07-06 17:41:10 +0800 |
|---|---|---|
| committer | John Hodge (bugs) <tpg@mutabah.net> | 2017-07-06 17:41:10 +0800 |
| commit | 48e2c4973d5401c9f7d0ee2bac22ac6015744961 (patch) | |
| tree | b93fb21b85343633e2d0c00c42ea7a388bb6f883 /src/macro_rules/macro_rules.hpp | |
| parent | ce3d36a90b9efd11c94f9084b5e727d65b6509a7 (diff) | |
| parent | c4e88b3c49736e71534c918a83956885c052beb8 (diff) | |
| download | mrust-48e2c4973d5401c9f7d0ee2bac22ac6015744961.tar.gz | |
Merge branch 'master' of https://github.com/thepowersgang/mrustc
# Conflicts:
# src/trans/codegen_c.cpp
Diffstat (limited to 'src/macro_rules/macro_rules.hpp')
| -rw-r--r-- | src/macro_rules/macro_rules.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macro_rules/macro_rules.hpp b/src/macro_rules/macro_rules.hpp index aed0e8ce..2a588a78 100644 --- a/src/macro_rules/macro_rules.hpp +++ b/src/macro_rules/macro_rules.hpp @@ -156,7 +156,7 @@ public: SERIALISABLE_PROTOTYPES(); }; -extern ::std::unique_ptr<TokenStream> Macro_InvokeRules(const char *name, const MacroRules& rules, TokenTree input, AST::Module& mod); +extern ::std::unique_ptr<TokenStream> Macro_InvokeRules(const char *name, const MacroRules& rules, const Span& sp, TokenTree input, AST::Module& mod); extern MacroRulesPtr Parse_MacroRules(TokenStream& lex); #endif // MACROS_HPP_INCLUDED |