diff options
author | Paul Phillips <paulp@improving.org> | 2012-09-20 14:07:01 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-09-20 14:07:01 -0700 |
commit | cc6f5f97f8a4290391a69ac96f134cb3e8ed4381 (patch) | |
tree | f2aa4f428719b7a8c8afd9959161f43b26a2c06d /test/files/run/macro-expand-overload.check | |
parent | c8e6f8e64c4d9967cee41486cc2e324da0262976 (diff) | |
parent | 08de8afde6c99fb1739eb9730e6fce4eef54f296 (diff) | |
download | scala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.tar.gz scala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.tar.bz2 scala-cc6f5f97f8a4290391a69ac96f134cb3e8ed4381.zip |
Merge remote-tracking branch 'paulp/topic/gitattributes' into 2.10.x
Diffstat (limited to 'test/files/run/macro-expand-overload.check')
-rw-r--r-- | test/files/run/macro-expand-overload.check | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/files/run/macro-expand-overload.check b/test/files/run/macro-expand-overload.check index 9d9989d85f..a2b7b0e781 100644 --- a/test/files/run/macro-expand-overload.check +++ b/test/files/run/macro-expand-overload.check @@ -1,6 +1,6 @@ -(fooObjectString,Expr[Nothing](Macros),42)
-(fooObjectInt,Expr[Nothing](Macros),42)
-fooObjectBoolean
-(fooClassString,Expr[Nothing](new Macros()),42)
-(fooClassInt,Expr[Nothing](new Macros()),42)
-fooClassBoolean
+(fooObjectString,Expr[Nothing](Macros),42) +(fooObjectInt,Expr[Nothing](Macros),42) +fooObjectBoolean +(fooClassString,Expr[Nothing](new Macros()),42) +(fooClassInt,Expr[Nothing](new Macros()),42) +fooClassBoolean |