From 9b02d5a62ea41136b46b744f7b2c1cf50f30a888 Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Wed, 4 Jan 2017 21:07:12 +0100
Subject: 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
---
 .../src/common/debugging/MSCFilter.h               | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'runtime/org.eclipse.etrice.runtime.cpp/src/common/debugging/MSCFilter.h')

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;
 
 };
 
-- 
cgit v1.2.3