Skip to content
This repository was archived by the owner on Jul 18, 2023. It is now read-only.

Commit b953d83

Browse files
committed
Fixed json mapping
1 parent f835989 commit b953d83

12 files changed

+143112
-8
lines changed

schemas/MTConnectAssets_2.1.xsd

Lines changed: 15475 additions & 0 deletions
Large diffs are not rendered by default.

schemas/MTConnectAssets_2.1_1.0.xsd

Lines changed: 15454 additions & 0 deletions
Large diffs are not rendered by default.

schemas/MTConnectDevices_2.1.xsd

Lines changed: 9759 additions & 0 deletions
Large diffs are not rendered by default.

schemas/MTConnectDevices_2.1_1.0.xsd

Lines changed: 9752 additions & 0 deletions
Large diffs are not rendered by default.

schemas/MTConnectError_2.1.xsd

Lines changed: 4376 additions & 0 deletions
Large diffs are not rendered by default.

schemas/MTConnectError_2.1_1.0.xsd

Lines changed: 4376 additions & 0 deletions
Large diffs are not rendered by default.

schemas/MTConnectStreams_2.1.xsd

Lines changed: 41939 additions & 0 deletions
Large diffs are not rendered by default.

schemas/MTConnectStreams_2.1_1.0.xsd

Lines changed: 41939 additions & 0 deletions
Large diffs are not rendered by default.

src/pipeline/transform.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ namespace mtconnect {
181181
if (it->get() == old.get())
182182
{
183183
*it = xform;
184-
for (auto nxt = old->m_next.begin(); it != old->m_next.end(); it++)
184+
for (auto nxt = old->m_next.begin(); nxt != old->m_next.end(); nxt++)
185185
{
186186
xform->bind(*nxt);
187187
}
@@ -196,7 +196,7 @@ namespace mtconnect {
196196
if (it->get() == old.get())
197197
{
198198
m_next.erase(it);
199-
for (auto nxt = old->m_next.begin(); it != old->m_next.end(); it++)
199+
for (auto nxt = old->m_next.begin(); nxt != old->m_next.end(); nxt++)
200200
{
201201
bind(*nxt);
202202
}

src/ruby/ruby_entity.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,8 @@ namespace mtconnect::ruby {
395395
[](mrb_state *mrb, mrb_value self) {
396396
auto entity = MRubySharedPtr<Entity>::unwrap(self);
397397
const char *key;
398-
mrb_get_args(mrb, "s", &key);
398+
399+
mrb_get_args(mrb, "z", &key);
399400

400401
auto props = entity->getProperties();
401402
auto it = props.find(key);
@@ -411,7 +412,7 @@ namespace mtconnect::ruby {
411412
auto entity = MRubySharedPtr<Entity>::unwrap(self);
412413
const char *key;
413414
mrb_value value;
414-
mrb_get_args(mrb, "so", &key, &value);
415+
mrb_get_args(mrb, "zo", &key, &value);
415416

416417
entity->setProperty(key, valueFromRuby(mrb, value));
417418

0 commit comments

Comments
 (0)