linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20
committer: poy <poy@xxxxxxxxxx>
branch nick: InserterPlugin
timestamp: Sun 2013-05-05 15:50:28 +0200
message:
  update dwt
modified:
  dwt/src/Dispatcher.cpp
  projects/make/Makefile


--
lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/InserterPlugin
https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/InserterPlugin

Your team Dcplusplus-team is subscribed to branch lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/InserterPlugin.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/InserterPlugin/+edit-subscription

=== modified file 'dwt/src/Dispatcher.cpp'
--- dwt/src/Dispatcher.cpp	2013-05-03 17:02:18 +0000
+++ dwt/src/Dispatcher.cpp	2013-05-05 13:50:28 +0000
@@ -37,6 +37,12 @@
 #include <algorithm>
 #include <sstream>
 
+#ifdef DWT_SHARED
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/random_generator.hpp>
+#include <boost/uuid/uuid_io.hpp>
+#endif
+
 namespace dwt {
 
 LRESULT CALLBACK WindowProc::initProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
@@ -222,8 +228,12 @@
 
 #ifdef DWT_SHARED
 	/* in a shared library, classes registered by the lib can't clash with those regged by the host
-	or by other dynamically loaded libs. append a (hopefully unique) string to that end... */
-	stream << &Application::instance();
+	or by other dynamically loaded libs. append a unique string to that end. */
+	static boost::uuids::uuid uuid;
+	if(uuid.is_nil()) {
+		uuid = boost::uuids::random_generator()();
+	}
+	stream << uuid;
 #endif
 
 	classNames.push_back(stream.str());

=== modified file 'projects/make/Makefile'
--- projects/make/Makefile	2013-05-03 17:03:28 +0000
+++ projects/make/Makefile	2013-05-05 13:50:28 +0000
@@ -126,10 +126,8 @@
 $(OUTPUT_DIR):
 	$(call MKDIR,$(OUTPUT_DIR)/pluginsdk)
 	$(call MKDIR,$(OUTPUT_DIR)/src)
-	$(call MKDIR,$(OUTPUT_DIR)/boost/libs/regex/src)
 	$(call MKDIR,$(OUTPUT_DIR)/dwt/src/util/win32)
 	$(call MKDIR,$(OUTPUT_DIR)/dwt/src/widgets)
-	$(call MKDIR,$(OUTPUT_DIR)/hunspell)
 
 clean:
 	$(call RMDIR,$(OUTPUT_DIR))