10 files changed, 59 insertions, 2 deletions

diff --git a/src/vmime/charset.cpp b/src/vmime/charset.cpp
index 8828c563..24d36307 100644
--- a/src/vmime/charset.cpp
+++ b/src/vmime/charset.cpp
@@ -57,6 +57,12 @@ charset::charset(const char* name)
 }
 
 
+charset::charset(const charset& other)
+	: m_name(other.m_name) {
+
+}
+
+
 void charset::parseImpl(
 	const parsingContext& /* ctx */,
 	const string& buffer,
diff --git a/src/vmime/charset.hpp b/src/vmime/charset.hpp
index 61f9bd69..fbe90946 100644
--- a/src/vmime/charset.hpp
+++ b/src/vmime/charset.hpp
@@ -47,6 +47,7 @@ public:
 	charset();
 	charset(const string& name);
 	charset(const char* name); // to allow creation from vmime::charsets constants
+	charset(const charset& other);
 
 public:
 
diff --git a/src/vmime/disposition.cpp b/src/vmime/disposition.cpp
index 6e10cb9d..4c808013 100644
--- a/src/vmime/disposition.cpp
+++ b/src/vmime/disposition.cpp
@@ -49,6 +49,15 @@ disposition::disposition(
 }
 
 
+disposition::disposition(const disposition& other)
+	: m_actionMode(other.m_actionMode),
+	  m_sendingMode(other.m_sendingMode),
+	  m_type(other.m_type),
+	  m_modifiers(other.m_modifiers) {
+
+}
+
+
 shared_ptr <component> disposition::clone() const {
 
 	shared_ptr <disposition> disp = make_shared <disposition>();
diff --git a/src/vmime/disposition.hpp b/src/vmime/disposition.hpp
index d4b023bf..37a98eef 100644
--- a/src/vmime/disposition.hpp
+++ b/src/vmime/disposition.hpp
@@ -47,6 +47,7 @@ public:
 		const string& type,
 		const string& modifier
 	);
+	disposition(const disposition& other);
 
 
 	shared_ptr <component> clone() const;
diff --git a/src/vmime/mediaType.cpp b/src/vmime/mediaType.cpp
index 95475937..7f68ab36 100644
--- a/src/vmime/mediaType.cpp
+++ b/src/vmime/mediaType.cpp
@@ -48,6 +48,13 @@ mediaType::mediaType(const string& type, const string& subType)
 }
 
 
+mediaType::mediaType(const mediaType& other)
+	: m_type(other.m_type),
+	  m_subType(other.m_subType) {
+
+}
+
+
 void mediaType::parseImpl(
 	const parsingContext& /* ctx */,
 	const string& buffer,
diff --git a/src/vmime/mediaType.hpp b/src/vmime/mediaType.hpp
index 4026167d..b18ed0fc 100644
--- a/src/vmime/mediaType.hpp
+++ b/src/vmime/mediaType.hpp
@@ -41,6 +41,7 @@ public:
 	mediaType();
 	mediaType(const string& type);
 	mediaType(const string& type, const string& subType);
+	mediaType(const mediaType& other);
 
 public:
 
diff --git a/src/vmime/net/smtp/SMTPResponse.cpp b/src/vmime/net/smtp/SMTPResponse.cpp
index 22347053..1208e0e9 100644
--- a/src/vmime/net/smtp/SMTPResponse.cpp
+++ b/src/vmime/net/smtp/SMTPResponse.cpp
@@ -294,6 +294,14 @@ SMTPResponse::responseLine::responseLine(
 }
 
 
+SMTPResponse::responseLine::responseLine(const responseLine& other)
+	: m_code(other.m_code),
+	  m_text(other.m_text),
+	  m_enhCode(other.m_enhCode) {
+
+}
+
+
 void SMTPResponse::responseLine::setCode(const int code) {
 
 	m_code = code;
@@ -330,6 +338,15 @@ const string SMTPResponse::responseLine::getText() const {
 }
 
 
+SMTPResponse::responseLine& SMTPResponse::responseLine::operator=(const responseLine& other) {
+
+	m_code = other.m_code;
+	m_text = other.m_text;
+	m_enhCode = other.m_enhCode;
+
+	return *this;
+}
+
 
 // SMTPResponse::enhancedStatusCode
 
@@ -350,6 +367,16 @@ SMTPResponse::enhancedStatusCode::enhancedStatusCode(const enhancedStatusCode& e
 }
 
 
+SMTPResponse::enhancedStatusCode& SMTPResponse::enhancedStatusCode::operator=(const enhancedStatusCode& other) {
+
+	klass = other.klass;
+	subject = other.subject;
+	detail = other.detail;
+
+	return *this;
+}
+
+
 std::ostream& operator<<(std::ostream& os, const SMTPResponse::enhancedStatusCode& code) {
 
 	os << code.klass << '.' << code.subject << '.' << code.detail;
diff --git a/src/vmime/net/smtp/SMTPResponse.hpp b/src/vmime/net/smtp/SMTPResponse.hpp
index 2eec7f4d..443204d8 100644
--- a/src/vmime/net/smtp/SMTPResponse.hpp
+++ b/src/vmime/net/smtp/SMTPResponse.hpp
@@ -65,6 +65,8 @@ public:
 		enhancedStatusCode();
 		enhancedStatusCode(const enhancedStatusCode& enhCode);
 
+		enhancedStatusCode& operator=(const enhancedStatusCode& other);
+
 		unsigned short klass;     /**< Success/failure. */
 		unsigned short subject;   /**< Source of anomaly. */
 		unsigned short detail;    /**< Precise error condition. */
@@ -76,6 +78,7 @@ public:
 	public:
 
 		responseLine(const int code, const string& text, const enhancedStatusCode& enhCode);
+		responseLine(const responseLine& other);
 
 		void setCode(const int code);
 		int getCode() const;
@@ -86,6 +89,8 @@ public:
 		void setText(const string& text);
 		const string getText() const;
 
+		responseLine& operator=(const responseLine& other);
+
 	private:
 
 		int m_code;
diff --git a/tests/testUtils.hpp b/tests/testUtils.hpp
index e6bf1eee..f625dec0 100644
--- a/tests/testUtils.hpp
+++ b/tests/testUtils.hpp
@@ -76,7 +76,7 @@
 	struct AutoRegisterModule { \
 		AutoRegisterModule() { \
 			static const char* moduleName = getTestModuleNameFromSourceFile(__FILE__); \
-			static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry1); \
+			static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE> autoRegisterRegistry1; \
 			static CppUnit::AutoRegisterSuite <VMIME_TEST_SUITE>(autoRegisterRegistry2)(moduleName); \
 			registerTestModule(moduleName); \
 		} \
diff --git a/tests/utility/urlTest.cpp b/tests/utility/urlTest.cpp
index 36820a68..d26cfb81 100644
--- a/tests/utility/urlTest.cpp
+++ b/tests/utility/urlTest.cpp
@@ -50,7 +50,7 @@ VMIME_TEST_SUITE_BEGIN(urlTest)
 
 			u = vmime::utility::url(str);
 
-		} catch (vmime::exceptions::malformed_url) {
+		} catch (vmime::exceptions::malformed_url&) {
 
 			return false;
 		}