aboutsummaryrefslogtreecommitdiffstats
path: root/src/util.hpp
diff options
context:
space:
mode:
authorfukubayashi.akio <fukubayashi.akio@genetec.co.jp>2019-06-03 17:59:13 +0900
committerfukubayashi.akio <fukubayashi.akio@genetec.co.jp>2019-06-03 17:59:13 +0900
commit98006b6538c5be44350746ec3756f004a5c68af8 (patch)
treef76ed8991d3837678c00722a23b779c4e2dcb67b /src/util.hpp
parentb6644e5cffa84e40d62e38f4ee0c14e64e0faf48 (diff)
Add boot sequence and multi ecu transfer
Signed-off-by: fukubayashi.akio <fukubayashi.akio@genetec.co.jp>
Diffstat (limited to 'src/util.hpp')
-rw-r--r--src/util.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/util.hpp b/src/util.hpp
index 9540772..4c3870f 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017 TOYOTA MOTOR CORPORATION
- * Copyright (c) 2018 Konsulko Group
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +19,8 @@
#include <functional>
#include <thread>
+#include <string>
+#include <vector>
#include <unordered_map>
#include <sys/poll.h>
#include <string.h>
@@ -54,6 +55,9 @@ void _HMI_LOG(enum LOG_LEVEL level, const char* file, const char* func, const in
void _HMI_SEQ_LOG(enum LOG_LEVEL level, const char* file, const char* func, const int line, unsigned seq_num, const char* log, ...);
void _DUMP(enum LOG_LEVEL level, const char *log, ...);
+std::vector<std::string> parseString(std::string str, char delimiter);
+std::string deleteSpace(std::string str);
+
struct rect
{
int32_t w, h;
@@ -119,9 +123,6 @@ class rectangle
long _bottom;
};
-// Configuration file path helper
-std::string get_file_path(const char *file_name, const char *root_path = NULL);
-
typedef struct ChangeAreaReq {
std::string appname;
std::unordered_map<std::string, struct rect> area_req;
@@ -132,5 +133,4 @@ typedef struct ChangeAreaReq {
ChangeAreaReq(const ChangeAreaReq& val) = default;
void dump();
} ChangeAreaReq;
-
-#endif // WM_UTIL_HPP
+#endif // !WM_UTIL_HPP