diff options
author | Roland Haas <roland.haas@physics.gatech.edu> | 2010-05-06 09:12:01 -0400 |
---|---|---|
committer | Roland Haas <roland.haas@physics.gatech.edu> | 2010-05-06 09:12:01 -0400 |
commit | 5dee9ed6a369f6fc70c8e89b0ef9839b2fae4520 (patch) | |
tree | 31bdf5490e345f8aaec1dca0270a1727b7b70976 /Tools/CodeGen/CodeGen.m | |
parent | cb874f331a3cf1faadf540762afa9817d4f42861 (diff) |
Revert "Revert "Merge branch 'master' of github.com:ianhinder/Kranc""
Merge was correct after all.
This reverts commit 04dfdcd32eec91978ba050a472aae2a6e7091c05.
Conflicts:
Tools/CodeGen/CalculationFunction.m
Tools/CodeGen/Thorn.m
Diffstat (limited to 'Tools/CodeGen/CodeGen.m')
-rw-r--r-- | Tools/CodeGen/CodeGen.m | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Tools/CodeGen/CodeGen.m b/Tools/CodeGen/CodeGen.m index e1776ad..13f8ecc 100644 --- a/Tools/CodeGen/CodeGen.m +++ b/Tools/CodeGen/CodeGen.m @@ -19,12 +19,8 @@ along with Kranc; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *) -BeginPackage["sym`"]; -{INV, SQR, CUB, QAD, exp, pow, fmax, fmin, dx, dy, dz, khalf, kthird, ktwothird, kfourthird, keightthird}; -EndPackage[]; - -BeginPackage["CodeGen`", {"sym`", "Errors`"}]; +BeginPackage["CodeGen`", {"Errors`", "Kranc`"}]; SOURCELANGUAGE::usage = "global variable == \"C\" or \"Fortran\" determines language for code generation"; |