Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2017-01-04 15:07:12 -0500
committerHenrik Rentz-Reichert2017-01-09 11:41:16 -0500
commit9b02d5a62ea41136b46b744f7b2c1cf50f30a888 (patch)
treed7473847da1a9e3a470195f384f62322b48057db /runtime/org.eclipse.etrice.runtime.cpp/src/common/debugging/MSCFilter.h
parentb8fd69cd558c0673971bcdaea495131bc4d7cd82 (diff)
downloadorg.eclipse.etrice-9b02d5a62ea41136b46b744f7b2c1cf50f30a888.tar.gz
org.eclipse.etrice-9b02d5a62ea41136b46b744f7b2c1cf50f30a888.tar.xz
org.eclipse.etrice-9b02d5a62ea41136b46b744f7b2c1cf50f30a888.zip
Bug 509875 - [runtime.cpp] replace STL containers with own containers that are more light weight
* replaced streaming code with (s)printf constructs * added String, Vector, Set, Pair and Map with tests * using new String class in * Address * Message * MSCFilter * MSCLogger * RTObject * and affected classes * using new Vector class in * RTObject * MSCLogger * MessageServiceController * ReplicatedActorClassBase * ReplicatedInterfaceItemBase * and affected classes * using new Set class in * MessageDispatcher * using new Map class in * SubSystemClassBase * DebuggingService * adjusted cpp generator Change-Id: I9c91289057185e6e36b9453ecf03f6f6d3834ec6
Diffstat (limited to 'runtime/org.eclipse.etrice.runtime.cpp/src/common/debugging/MSCFilter.h')
-rw-r--r--runtime/org.eclipse.etrice.runtime.cpp/src/common/debugging/MSCFilter.h26
1 files changed, 15 insertions, 11 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.cpp/src/common/debugging/MSCFilter.h b/runtime/org.eclipse.etrice.runtime.cpp/src/common/debugging/MSCFilter.h
index a3c5d98d6..6ec0f1a84 100644
--- a/runtime/org.eclipse.etrice.runtime.cpp/src/common/debugging/MSCFilter.h
+++ b/runtime/org.eclipse.etrice.runtime.cpp/src/common/debugging/MSCFilter.h
@@ -14,8 +14,8 @@
#define MSCFILTER_H_
#include "etDatatypes.h"
-#include <list>
-#include <string>
+#include "common/containers/String.h"
+#include "common/containers/Vector.h"
namespace etRuntime {
@@ -23,14 +23,18 @@ class MSCFilter {
public:
class FilterItem {
public:
- FilterItem(const std::string& filter_, etBool exclude_) :
- exclude(exclude_),
- filter(filter_) {
+ FilterItem(const String& filter_, etBool exclude_)
+ : exclude(exclude_)
+ , filter(filter_)
+ {
+ }
+ FilterItem()
+ : exclude()
+ , filter()
+ {
}
etBool exclude;
- std::string filter;
- private:
- FilterItem();
+ String filter;
};
MSCFilter();
@@ -38,11 +42,11 @@ public:
}
void addFilter(FilterItem filter);
- etBool applyTo(const std::string& text);
- std::string reduceString(const std::string& string);
+ etBool applyTo(const String& text);
+ String reduceString(const String& text);
private:
- std::list<FilterItem> filterList;
+ Vector<FilterItem> filterList;
};

Back to the top