diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2019-10-07 16:35:45 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2019-10-15 11:33:26 -0400 |
| commit | 40a0b16e2e4e8b030473254c2f04b4b377bf76f1 (patch) | |
| tree | 68a58831caaea9975e22b92f4824a34971d4b39c /src/plugins/VshlCoreApi.cpp | |
| parent | 481e2d73b8c3f9cd9a28611ddb6ae190225dc36a (diff) | |
Switch to afb-helpers library
Remove old afb-helpers submodule usage in favor of library from the
toolchain. Note that json.hpp is no longer shipped with the library,
and is now assumed to be present in the toolchain, which requires a
DEPENDS addition in the recipe to pick it up, and an #include of
sstream to work with newer versions of json.hpp.
Bug-AGL: SPEC-2854
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Iea205048b051a69d5251d295588ce3451efc7e4a
(cherry picked from commit 4b6fce387aa0b175bfb1b30de8d671434918a217)
Diffstat (limited to 'src/plugins/VshlCoreApi.cpp')
| -rw-r--r-- | src/plugins/VshlCoreApi.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/VshlCoreApi.cpp b/src/plugins/VshlCoreApi.cpp index a91ca3e..a28193c 100644 --- a/src/plugins/VshlCoreApi.cpp +++ b/src/plugins/VshlCoreApi.cpp @@ -1,5 +1,6 @@ /* * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2019 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -15,6 +16,8 @@ #include "VshlCoreApi.h" #include <list> +#include <sstream> +#include <json.hpp> #include "afb/AFBApiImpl.h" #include "afb/AFBRequestImpl.h" @@ -24,8 +27,6 @@ #include "voiceagents/VoiceAgentEventNames.h" #include "voiceagents/VoiceAgentsDataManager.h" -#include "json.hpp" - using namespace std; CTLP_CAPI_REGISTER("vshl-core-api"); @@ -345,4 +346,4 @@ CTLP_CAPI(setDefaultVoiceAgent, source, argsJ, eventJ) { AFB_ReqSuccess(source->request, NULL, NULL); return 0; -}
\ No newline at end of file +} |