diff options
author | JackLivio <jack@livio.io> | 2018-10-19 15:05:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-19 15:05:09 -0400 |
commit | d36316738785c96dab2ee892762ed08c059fffde (patch) | |
tree | 168a7c0705b5bc8f0dee7ce4b511ccf71759d9b4 /src/components/formatters/src/meta_formatter.cc | |
parent | 7f7fcbb998fb17f2954fd103349af67ea9b71a3f (diff) | |
parent | 83c5e805346d55ec7fb9f4ba8b6f6855d992273e (diff) | |
download | sdl_core-d36316738785c96dab2ee892762ed08c059fffde.tar.gz |
Merge pull request #2572 from smartdevicelink/release/5.0.05.0.0hotfix/templates_updatesfeature/show_app_menufeature/progress_bar_seekfeature/open-menu-rpcfeature/open-menu-rfeature/button
Release 5.0.0
Diffstat (limited to 'src/components/formatters/src/meta_formatter.cc')
-rw-r--r-- | src/components/formatters/src/meta_formatter.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/components/formatters/src/meta_formatter.cc b/src/components/formatters/src/meta_formatter.cc index fafb84e938..82dd611498 100644 --- a/src/components/formatters/src/meta_formatter.cc +++ b/src/components/formatters/src/meta_formatter.cc @@ -38,15 +38,15 @@ #include "formatters/meta_formatter.h" -namespace formatter_ns = NsSmartDeviceLink::NsJSONHandler::Formatters; -namespace smart_objects_ns = NsSmartDeviceLink::NsSmartObjects; +namespace formatter_ns = ns_smart_device_link::ns_json_handler::formatters; +namespace smart_objects_ns = ns_smart_device_link::ns_smart_objects; //--------------------------------------------------------------- bool formatter_ns::CMetaFormatter::CreateObjectByPattern( - const NsSmartDeviceLink::NsSmartObjects::SmartObject& object, - const NsSmartDeviceLink::NsSmartObjects::CSmartSchema& schema, - NsSmartDeviceLink::NsSmartObjects::SmartObject& result_object) { + const ns_smart_device_link::ns_smart_objects::SmartObject& object, + const ns_smart_device_link::ns_smart_objects::CSmartSchema& schema, + ns_smart_device_link::ns_smart_objects::SmartObject& result_object) { if (smart_objects_ns::SmartType_Invalid == result_object.getType()) { return false; } |