[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdevplatform/plugins
From:       David Nolden <david.nolden.kde () art-master ! de>
Date:       2007-07-04 15:35:09
Message-ID: 1183563309.114802.9285.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 683322 by zwabel:

1. Use text-archive instead of polymorphic archive for serialization. Compliation on \
64-bit should work again. 2. Re-enable teamwork compilation. It is quite probable \
that the change of the archive also solves the other boost compilation problems. If \
it does not, contact me.

 M  +5 -5      CMakeLists.txt  
 M  +1 -1      teamwork/filecollaborationmessages.h  
 M  +2 -2      teamwork/lib/network/helpers.cpp  
 M  +2 -1      teamwork/lib/network/networkfwd.h  
 M  +17 -2     teamwork/lib/network/serverconfig.cpp  


--- trunk/KDE/kdevplatform/plugins/CMakeLists.txt #683321:683322
@@ -14,11 +14,11 @@
 #/usr/include/boost/archive/detail/oserializer.hpp:131: error: invalid use of \
undefined type 'struct boost::serialization::extended_type_info_null<Teamwork::User>' \
#/usr/include/boost/serialization/type_info_implementation.hpp:26: error: declaration \
of 'struct boost::serialization::extended_type_info_null<Teamwork::User>'  \
                ############################################################################
                
-#find_package(Commoncpp)
-#find_package(BoostLibraries)
-#if(COMMONCPP2_FOUND AND Boost_FOUND AND Boost_LIBS_FOUND)
-#    macro_optional_add_subdirectory(teamwork)
-#endif(COMMONCPP2_FOUND AND Boost_FOUND  AND Boost_LIBS_FOUND)
+find_package(Commoncpp)
+find_package(BoostLibraries)
+if(COMMONCPP2_FOUND AND Boost_FOUND AND Boost_LIBS_FOUND)
+    macro_optional_add_subdirectory(teamwork)
+endif(COMMONCPP2_FOUND AND Boost_FOUND  AND Boost_LIBS_FOUND)
 
 find_package(SubversionLibrary)
 if(SUBVERSION_FOUND)
--- trunk/KDE/kdevplatform/plugins/teamwork/filecollaborationmessages.h \
#683321:683322 @@ -50,7 +50,7 @@
 
 typedef std::list<CollabFile> CollabFileList;
 
-typedef quint64 CollabSessionId; //unsigned long long CollabSessionId;
+typedef quint64 CollabSessionId;
 
 class FileCollaborationMessageData {
   public:
--- trunk/KDE/kdevplatform/plugins/teamwork/lib/network/helpers.cpp #683321:683322
@@ -30,8 +30,8 @@
 typedef boost::archive::polymorphic_text_iarchive InternalIArchive;
 typedef boost::archive::polymorphic_text_oarchive InternalOArchive;
 #else
-typedef IArchive InternalIArchive;
-typedef OArchive InternalOArchive;
+typedef Teamwork::InArchive InternalIArchive;
+typedef Teamwork::OutArchive InternalOArchive;
 #endif
 
 std::string formatInt( int i ) {
--- trunk/KDE/kdevplatform/plugins/teamwork/lib/network/networkfwd.h #683321:683322
@@ -15,7 +15,8 @@
 #ifndef NETWORKFWD_H
 #define NETWORKFWD_H
 
-#define USE_POLYMORPHIC_ARCHIVE
+//#define USE_POLYMORPHIC_ARCHIVE
+#define USE_TEXT_ARCHIVE
 
 class MessageSerialization;
 class NormalSerialization;
--- trunk/KDE/kdevplatform/plugins/teamwork/lib/network/serverconfig.cpp \
#683321:683322 @@ -24,6 +24,21 @@
 #include "defines.h"
 #include <iostream>
 
+#ifdef USE_POLYMORPHIC_ARCHIVE
+// #include <boost/archive/polymorphic_xml_iarchive.hpp>
+// #include <boost/archive/polymorphic_xml_oarchive.hpp>
+// typedef boost::archive::polymorphic_xml_iarchive InternalIArchive;
+// typedef boost::archive::polymorphic_xml_oarchive InternalOArchive;
+
+#include <boost/archive/polymorphic_text_iarchive.hpp>
+#include <boost/archive/polymorphic_text_oarchive.hpp>
+typedef boost::archive::polymorphic_text_iarchive InternalIArchive;
+typedef boost::archive::polymorphic_text_oarchive InternalOArchive;
+#else
+typedef Teamwork::InArchive InternalIArchive;
+typedef Teamwork::OutArchive InternalOArchive;
+#endif
+
 namespace Teamwork {
 
 ServerConfiguration::ServerConfiguration() : port( STANDARDPORT ), bind( "0.0.0.0" ) \
{ @@ -35,7 +50,7 @@
     cout << "could not open config-file" << endl;
     return false;
   }
-  boost::archive::polymorphic_text_iarchive arch( file );
+  InternalIArchive arch( file );
   try {
   } catch( ... ) {
     cout << "error while reading the config-file" << endl;
@@ -62,7 +77,7 @@
     return false;
   }
   /*boost::archive::polymorphic_text_oarchive*/
-  boost::archive::polymorphic_text_oarchive arch( file );
+  InternalOArchive arch( file );
   try {
   } catch( ... ) {
     cout << "error while loading the config-file" << endl;


[prev in list] [next in list] [prev in thread] [next in thread]