Removed useless 'virtual' inheritance (fixed issue #84).

kisli · Jun 6, 2014 · 4aefcca · 4aefcca
1 parent 30ea54f
commit 4aefcca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/vmime/contentDispositionField.cpp b/src/vmime/contentDispositionField.cpp
@@ -35,7 +35,7 @@ contentDispositionField::contentDispositionField()
 
 
 contentDispositionField::contentDispositionField(contentDispositionField&)
-	: headerField(), parameterizedHeaderField()
+	: parameterizedHeaderField()
 {
 }
 

diff --git a/src/vmime/contentTypeField.cpp b/src/vmime/contentTypeField.cpp
@@ -35,7 +35,7 @@ contentTypeField::contentTypeField()
 
 
 contentTypeField::contentTypeField(contentTypeField&)
-	: headerField(), parameterizedHeaderField()
+	: parameterizedHeaderField()
 {
 }
 

diff --git a/src/vmime/parameterizedHeaderField.hpp b/src/vmime/parameterizedHeaderField.hpp
@@ -39,7 +39,7 @@ namespace vmime
   * Parameters can be created using vmime::parameterFactory.
   */
 
-class VMIME_EXPORT parameterizedHeaderField : virtual public headerField
+class VMIME_EXPORT parameterizedHeaderField : public headerField
 {
 	friend class headerFieldFactory;
 

diff --git a/tests/parser/parameterTest.cpp b/tests/parser/parameterTest.cpp
@@ -48,8 +48,8 @@ VMIME_TEST_SUITE_BEGIN(parameterTest)
 	public:
 
 		parameterizedHeaderField()
-			: headerField("F")
 		{
+			setName("F");
 			setValue(vmime::headerFieldFactory::getInstance()->createValue(getName()));
 			setValue(vmime::word("X"));
 		}