Merge branch 'master' of https://github.com/kisli/vmime

CMakeLists.txt

@@ -1020,7 +1020,7 @@ ELSE()
 
 		SET(
 			CMAKE_CXX_FLAGS
-			"${CMAKE_CXX_FLAGS} -D_REENTRANT=1 -W -Wall -ansi -pedantic -Wpointer-arith -Wold-style-cast -Wconversion -Wcast-align -Wno-long-long"
+			"${CMAKE_CXX_FLAGS} -D_REENTRANT=1 -W -Wall -pedantic -Wpointer-arith -Wold-style-cast -Wconversion -Wcast-align -Wno-long-long"
 			CACHE STRING
 			"g++ Compiler Flags"
 			FORCE

src/vmime/fileAttachment.hpp

@@ -58,7 +58,7 @@ class VMIME_EXPORT fileAttachment : public defaultAttachment
 
 	/** Stores information about a file attachment.
 	  */
-	class fileInfo
+	class VMIME_EXPORT fileInfo
 	{
 	public:
 

src/vmime/htmlTextPart.hpp

@@ -59,7 +59,7 @@ class VMIME_EXPORT htmlTextPart : public textPart
 
 	/** Embedded object (eg: image for <IMG> tag).
 	  */
-	class embeddedObject : public object
+	class VMIME_EXPORT embeddedObject : public object
 	{
 	public:
 

src/vmime/net/serviceInfos.hpp

@@ -65,7 +65,7 @@ class VMIME_EXPORT serviceInfos
 
 	/** A service property.
 	  */
-	class property
+	class VMIME_EXPORT property
 	{
 	public:
 

src/vmime/platforms/windows/windowsSocket.hpp

@@ -73,6 +73,7 @@ class windowsSocket : public vmime::net::socket
 	const string getPeerAddress() const;
 
 	shared_ptr <net::timeoutHandler> getTimeoutHandler();
+	shared_ptr <net::tracer> m_tracer;
 
 	void setTracer(shared_ptr <net::tracer> tracer);
 	shared_ptr <net::tracer> getTracer();