diff options
| author | Csaba Hruska <csaba.hruska@gmail.com> | 2016-03-21 14:15:17 +0100 |
|---|---|---|
| committer | Csaba Hruska <csaba.hruska@gmail.com> | 2016-03-21 14:15:17 +0100 |
| commit | 5cd71fce0fffcf04a71bb42e3ef44776d66ff633 (patch) | |
| tree | 8fca46048a1f32dd6b1979e6dd6d0774b1c9182d /ddl/out/LambdaCube.PipelineSchema.cpp | |
| parent | 10de287e9fdbdcae58048cc386416a4e72a5199b (diff) | |
merge
Diffstat (limited to 'ddl/out/LambdaCube.PipelineSchema.cpp')
| -rw-r--r-- | ddl/out/LambdaCube.PipelineSchema.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/ddl/out/LambdaCube.PipelineSchema.cpp b/ddl/out/LambdaCube.PipelineSchema.cpp index 45e4dce..f4c1946 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cpp +++ b/ddl/out/LambdaCube.PipelineSchema.cpp | |||
| @@ -1,21 +1,5 @@ | |||
| 1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
| 2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.137981000000Z |
| 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
| 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
| 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
| 6 | // 2016-03-01T13:00:40.761274000000Z | ||
| 7 | ======= | ||
| 8 | // 2016-03-20T21:42:12.892571000000Z | ||
| 9 | >>>>>>> working c# backend | ||
| 10 | ======= | ||
| 11 | // 2016-03-20T22:19:43.498688000000Z | ||
| 12 | >>>>>>> fix c# | ||
| 13 | ======= | ||
| 14 | // 2016-03-21T11:36:01.075399000000Z | ||
| 15 | >>>>>>> work on java json loader | ||
| 16 | ======= | ||
| 17 | // 2016-03-21T11:41:52.343859000000Z | ||
| 18 | >>>>>>> improve java json | ||
| 19 | 3 | ||
| 20 | #include "LambdaCube.PipelineSchema.hpp" | 4 | #include "LambdaCube.PipelineSchema.hpp" |
| 21 | template<> json toJSON<std::shared_ptr<StreamType>>(std::shared_ptr<StreamType> &v) { | 5 | template<> json toJSON<std::shared_ptr<StreamType>>(std::shared_ptr<StreamType> &v) { |