Merge branches 'ignite-642' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-642-19
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b8fdb9dc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b8fdb9dc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b8fdb9dc Branch: refs/heads/ignite-642 Commit: b8fdb9dca7c6668dcbe6041d6612a46686a98993 Parents: d24fff6 322e61c Author: Yakov Zhdanov <[email protected]> Authored: Wed Apr 13 18:03:06 2016 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Wed Apr 13 18:03:06 2016 +0300 ---------------------------------------------------------------------- .../os/linux/include/ignite/common/common.h | 20 ++++--- .../os/win/include/ignite/common/common.h | 8 ++- .../cpp/core-test/src/ignite_error_test.cpp | 2 +- .../cpp/core/include/ignite/ignite_error.h | 9 +-- modules/platforms/cpp/core/src/ignite_error.cpp | 27 +++++---- .../ignite/schema/generator/CodeGenerator.java | 20 +------ .../ignite/schema/generator/GeneratorUtils.java | 53 +++++++++++++++++ .../ignite/schema/generator/XmlGenerator.java | 62 +++++++++++++++----- .../schema/test/model/ignite-type-metadata.xml | 44 +++++++------- 9 files changed, 167 insertions(+), 78 deletions(-) ----------------------------------------------------------------------
