aboutsummaryrefslogtreecommitdiffstats
path: root/src/hs-clientmanager.h
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-05-26 17:49:50 -0400
committerScott Murray <scott.murray@konsulko.com>2020-05-26 18:27:40 -0400
commit89edd734c0a347dafceba1cef1ac835e0fe61e1a (patch)
treed54ef3bc130749b9c4241f22663b508c697af9f5 /src/hs-clientmanager.h
parent055909f4a7b27003bdd60c1cee764cf1d23be9cc (diff)
Fix CMake files and non-debug crashes
Changes include: - Reworked src/CMakeLists.txt to use app template macros. - Removed now unnecessary linker script, symbol exports are handled in the app template macros. - Set missing required entries in conf.d/cmake/config.cmake, and update to match latest template version in cmake-apps-module, as well as some naming fixes in the PROJECT* definitions. - Move project definition to top-level CMakeLists.txt to make tracking conf.d/cmake/config.cmake changes easier. This quiets the warning from newer versions of CMake about needing a project definition in the top-level CMakeLists.txt. - Moved icon file to default location for app template. - Added config.xml.in file to work with app template, replacing previous hard-coded version. - Fixed some issues in src/hs-clientmanager.{h,cpp} to address crashes seen in the release widget now that it is actually built without debug flags, and to quiet some warnings. Bug-AGL: SPEC-3343 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I3741e6a307297272d5c22e894dfa9ff8b0dd1f52
Diffstat (limited to 'src/hs-clientmanager.h')
-rw-r--r--src/hs-clientmanager.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/hs-clientmanager.h b/src/hs-clientmanager.h
index efc36de..7ca6411 100644
--- a/src/hs-clientmanager.h
+++ b/src/hs-clientmanager.h
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2018 TOYOTA MOTOR CORPORATION
+ * Copyright (C) 2020 Konsulko Group
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,14 +25,13 @@
#include "hs-helper.h"
#include "hs-client.h"
-typedef struct HS_ClientCtxt
-{
+struct HS_ClientCtxt {
std::string id;
- HS_ClientCtxt(const char *appid)
+ HS_ClientCtxt(const std::string &appid)
{
id = appid;
}
-} HS_ClientCtxt;
+};
class HS_ClientManager {
@@ -61,4 +61,4 @@ private:
std::mutex mtx;
};
-#endif // HOMESCREEN_CLIENTMANAGER_H \ No newline at end of file
+#endif // HOMESCREEN_CLIENTMANAGER_H