diff options
| author | Csaba Hruska <csaba.hruska@gmail.com> | 2016-03-20 23:20:35 +0100 |
|---|---|---|
| committer | Csaba Hruska <csaba.hruska@gmail.com> | 2016-03-21 14:12:08 +0100 |
| commit | 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 (patch) | |
| tree | 716e9b6f90bdf55b9a5f0cfe33f2b77a1b9f71b1 /ddl/out/LambdaCube.IR.cpp | |
| parent | c5e063b3c9aeff65161e24445e9672daff980b45 (diff) | |
fix c#
Diffstat (limited to 'ddl/out/LambdaCube.IR.cpp')
| -rw-r--r-- | ddl/out/LambdaCube.IR.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp index fcbcebb..6e0691b 100644 --- a/ddl/out/LambdaCube.IR.cpp +++ b/ddl/out/LambdaCube.IR.cpp | |||
| @@ -1,9 +1,13 @@ | |||
| 1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
| 2 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
| 2 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 3 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
| 3 | // 2016-03-01T13:00:40.426854000000Z | 4 | // 2016-03-01T13:00:40.426854000000Z |
| 4 | ======= | 5 | ======= |
| 5 | // 2016-03-20T21:42:12.172652000000Z | 6 | // 2016-03-20T21:42:12.172652000000Z |
| 6 | >>>>>>> working c# backend | 7 | >>>>>>> working c# backend |
| 8 | ======= | ||
| 9 | // 2016-03-20T22:19:42.844053000000Z | ||
| 10 | >>>>>>> fix c# | ||
| 7 | 11 | ||
| 8 | #include "LambdaCube.IR.hpp" | 12 | #include "LambdaCube.IR.hpp" |
| 9 | template<> json toJSON<std::shared_ptr<ArrayValue>>(std::shared_ptr<ArrayValue> &v) { | 13 | template<> json toJSON<std::shared_ptr<ArrayValue>>(std::shared_ptr<ArrayValue> &v) { |