diff --git a/SpeckleConnector/Connector/Database/Model/Card/ModelCardDatabase.cpp b/SpeckleConnector/Connector/Database/Model/Card/ModelCardDatabase.cpp index 5171ac6..701a473 100644 --- a/SpeckleConnector/Connector/Database/Model/Card/ModelCardDatabase.cpp +++ b/SpeckleConnector/Connector/Database/Model/Card/ModelCardDatabase.cpp @@ -21,7 +21,7 @@ namespace { ///Serialisation field IDs static std::array fieldID = { - Identity{"model"}, + Identity{"models"}, }; } diff --git a/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.h b/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.h index 7b4d0ff..64e3031 100644 --- a/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.h +++ b/SpeckleLib/Speckle/Interface/Browser/Bridge/BrowserBridge.h @@ -3,8 +3,7 @@ #include "Speckle/Interface/Browser/JSObject.h" #include "Speckle/Interface/Browser/Functional.h" -#include "Speckle/Interface/Browser/Bridge/JSBridgeArgumentWrap.h" -#include "Speckle/Interface/Browser/Bridge/JSBridgeMethod.h" +#include "Speckle/Interface/Browser/Bridge/JSBridgeMethodBase.h" namespace active::setting { class ValueSetting; diff --git a/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetCallResult.cpp b/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetCallResult.cpp index 158c271..4930a56 100644 --- a/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetCallResult.cpp +++ b/SpeckleLib/Speckle/Interface/Browser/Bridge/Functions/GetCallResult.cpp @@ -39,11 +39,12 @@ GetCallResult::GetCallResult(BrowserBridge& bridge) : m_bridge{bridge}, --------------------------------------------------------------------*/ std::unique_ptr GetCallResult::getResult(WrappedResultArg& argument) const { //Retrieve the requested result + using namespace json; auto result = m_bridge.releaseResult(argument); auto item = dynamic_cast(result.get()); if (!item) return nullptr; String jsonOutput; - json::JSONTransport().send(std::forward(*item), Identity{}, jsonOutput); + JSONTransport().send(std::forward(*item), Identity{}, jsonOutput); return std::make_unique(jsonOutput); } //GetCallResult::getResult