[Scummvm-cvs-logs] SF.net SVN: scummvm: [28103] scummex/branches/gsoc2007-gameresbrowser/src

zbychs at users.sourceforge.net zbychs at users.sourceforge.net
Sun Jul 15 16:55:44 CEST 2007


Revision: 28103
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28103&view=rev
Author:   zbychs
Date:     2007-07-15 07:55:44 -0700 (Sun, 15 Jul 2007)

Log Message:
-----------
Removed explicit std::vector specialisations. Should fix the duplicate symbol link errors.

Modified Paths:
--------------
    scummex/branches/gsoc2007-gameresbrowser/src/browser/FileType.h
    scummex/branches/gsoc2007-gameresbrowser/src/core/guid.h

Modified: scummex/branches/gsoc2007-gameresbrowser/src/browser/FileType.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browser/FileType.h	2007-07-15 14:27:45 UTC (rev 28102)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browser/FileType.h	2007-07-15 14:55:44 UTC (rev 28103)
@@ -77,6 +77,7 @@
 	}
 };
 
+/* FIXME: if we're doing a DLL this should be investigated
 } //namespace Browser
 
 #ifdef _MSC_VER
@@ -88,6 +89,7 @@
 #endif
 
 namespace Browser {
+*/
 
 typedef std::vector<RecognizedFileType> RecognizedFileTypes;
 

Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/guid.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/guid.h	2007-07-15 14:27:45 UTC (rev 28102)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/guid.h	2007-07-15 14:55:44 UTC (rev 28103)
@@ -56,20 +56,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 
-} //namespace Core
-
-#ifdef _MSC_VER
-#pragma warning(disable : 4251 4231)
-#endif
-CORE_API_TEMPLATE template class CORE_API std::vector<Core::BGUID>;
-#ifdef _MSC_VER
-#pragma warning(default : 4251 4231)
-#endif
-
-namespace Core {
-
-typedef std::vector<BGUID> guid_arr_t;
-
 //WX_DECLARE_OBJARRAY_WITH_DECL(BGUID, guid_arr_t, class CORE_API);
 //think of this as a std::list<BGUID*>
 WX_DECLARE_LIST_WITH_DECL(BGUID, guid_list_t, class CORE_API);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list