fix for build error

Conflicts:
	aconversions/src/re2fa/Brzozowski.cpp
	libaderivation/src/RegExpDerivation.cpp
	libaregexptree/src/RegExpAlphabet.cpp

alib/src/regexp/RegExpPrinter.cpp

@@ -83,7 +83,7 @@ void RegExpPrinter::printIteration(Iteration* iteration, ostream& out, string pr
 void RegExpPrinter::printSymbol(RegExpSymbol* symbol, ostream& out, string prefix) {
 	out << prefix << "<symbol>";
-	out << symbol->getSymbol();
+	out << symbol->getSymbol().getSymbol();
 	out << "</symbol>\n";
 }

alib/src/regexp/RegExpSymbol.cpp

@@ -10,15 +10,15 @@
 namespace regexp {
 RegExpSymbol::RegExpSymbol() :
-		Symbol("") {
+		symbol("") {
 }
 RegExpSymbol::RegExpSymbol(const string& symbol) :
-		Symbol(symbol) {
+		symbol(symbol) {
 }
 RegExpElement* RegExpSymbol::clone() const {
-	return new RegExpSymbol(this->symbol);
+	return new RegExpSymbol(this->symbol.getSymbol());
 }
 bool RegExpSymbol::operator<(const RegExpElement& other) const {
@@ -70,5 +70,9 @@ bool RegExpSymbol::containsEmptyString() const {
 	return false;
 }
+const Symbol& RegExpSymbol::getSymbol() const {
+	return this->symbol;
+}
+
 } /* namespace regexp */

alib/src/regexp/RegExpSymbol.h

@@ -20,7 +20,8 @@ using namespace alphabet;
 /**
  * Represents symbol in the regular expression. Contains name of the symbol.
  */
-class RegExpSymbol: public RegExpElement, public Symbol {
+class RegExpSymbol: public RegExpElement {
+	Symbol symbol;
 public:
 	RegExpSymbol();
 	RegExpSymbol(const string& symbol);
@@ -48,6 +49,8 @@ public:
 	 * @copydoc RegExpElement::containsEmptyString() const
 	 */
 	bool containsEmptyString() const;
+	
+	const Symbol& getSymbol() const;
 };
 } /* namespace regexp */