From d277855f842cd624845c9e7785701788f706a743 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Thu, 24 Apr 2014 11:14:39 +0200
Subject: [PATCH] fix Epsilon inheritance
---
alib2/src/string/Epsilon.cpp | 8 ++++----
alib2/src/string/Epsilon.h | 6 ++++++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/alib2/src/string/Epsilon.cpp b/alib2/src/string/Epsilon.cpp
index cb621a9761..2788155acb 100644
--- a/alib2/src/string/Epsilon.cpp
+++ b/alib2/src/string/Epsilon.cpp
@@ -13,12 +13,12 @@ Epsilon::Epsilon() : String(), CyclicString() {
}
-bool CyclicString::operator<(const CyclicString& other) const {
- return m_Data < other.m_Data;
+bool Epsilon::operator<(const Epsilon& other) const {
+ return false;
}
-bool CyclicString::operator==(const CyclicString& other) const {
- return m_Data == other.m_Data;
+bool Epsilon::operator==(const Epsilon& other) const {
+ return true;
}
} /* namespace string */
diff --git a/alib2/src/string/Epsilon.h b/alib2/src/string/Epsilon.h
index f31b26328e..80d6a51615 100644
--- a/alib2/src/string/Epsilon.h
+++ b/alib2/src/string/Epsilon.h
@@ -21,6 +21,12 @@ class Epsilon : public String, public CyclicString {
public:
Epsilon();
+ using String::getAlphabet;
+
+ using String::getContent;
+
+ using String::isEmpty;
+
bool operator<(const Epsilon& other) const;
bool operator==(const Epsilon& other) const;
--
GitLab