recipes/librcf/files/rcf-0.4-g++-4.1.diff

   1 diff -uNr RCF-0.4-orig/Makefile RCF-0.4/Makefile
   2 --- RCF-0.4-orig/Makefile       1970-01-01 01:00:00.000000000 +0100
   3 +++ RCF-0.4/Makefile    2006-10-24 16:08:00.799705810 +0200
   4 @@ -0,0 +1,32 @@
   5 +#
   6 +# Top level Makefile for RCF library and test programs
   7 +#
   8 +# Martin Dietze <dietze@4g-systems.com>
   9 +#
  10 +
  11 +SUBDIRS = src test
  12 +DESTDIR =
  13 +prefix = /usr/local
  14 +
  15 +.PHONY: all clean test syntax shared install uninstall
  16 +
  17 +all:
  18 +       @for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit 1; done
  19 +
  20 +shared:
  21 +       @for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit 1; done
  22 +
  23 +install:
  24 +       $(MAKE) -C src $@
  25 +
  26 +uninstall:
  27 +       $(MAKE) -C src $@
  28 +
  29 +syntax:
  30 +       @for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit 1; done
  31 +
  32 +test:
  33 +       $(MAKE) -C $@ $@
  34 +
  35 +clean:
  36 +       @for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit 1; done
  37 diff -uNr RCF-0.4-orig/include/RCF/CheckRtti.hpp RCF-0.4/include/RCF/CheckRtti.hpp
  38 --- RCF-0.4-orig/include/RCF/CheckRtti.hpp      2006-01-11 01:06:52.000000000 +0100
  39 +++ RCF-0.4/include/RCF/CheckRtti.hpp   2006-10-19 10:03:09.000000000 +0200
  40 @@ -24,7 +24,7 @@
  41              {}
  42          };
  43
  44 -        struct B
  45 +        struct B : public A
  46          {
  47              virtual ~B()
  48              {}
  49 @@ -35,7 +35,7 @@
  50              B b;
  51              // RTTI support not detected!
  52              // If you're using Visual C++, set "Enable Run-Time Type Info" to true, in the Project Properties | C/C++ | Language options,
  53 -            dynamic_cast<A &>(b);
  54 +            (void)dynamic_cast<A &>(b);
  55          }
  56      };
  57
  58 diff -uNr RCF-0.4-orig/include/RCF/EndpointBrokerService.hpp RCF-0.4/include/RCF/EndpointBrokerService.hpp
  59 --- RCF-0.4-orig/include/RCF/EndpointBrokerService.hpp  2006-01-11 01:06:52.000000000 +0100
  60 +++ RCF-0.4/include/RCF/EndpointBrokerService.hpp       2006-10-19 10:16:40.000000000 +0200
  61 @@ -49,12 +49,12 @@
  62          friend class EndpointBrokerService;
  63          typedef RcfClient<I_EndpointServer> Client;
  64          typedef boost::shared_ptr<Client> ClientPtr;
  65 +        ServerTransportPtr mServerTransportPtr;
  66          std::string mEndpointName;
  67 -        std::string mEndpointServerPassword;
  68          std::string mEndpointClientPassword;
  69 +        std::string mEndpointServerPassword;
  70          std::vector<SessionPtr> mConnections;
  71          ClientPtr mMasterConnection;
  72 -        ServerTransportPtr mServerTransportPtr;
  73      };
  74
  75      class EndpointBrokerService :
  76 diff -uNr RCF-0.4-orig/include/RCF/IpServerTransport.hpp RCF-0.4/include/RCF/IpServerTransport.hpp
  77 --- RCF-0.4-orig/include/RCF/IpServerTransport.hpp      2006-02-04 01:01:22.000000000 +0100
  78 +++ RCF-0.4/include/RCF/IpServerTransport.hpp   2006-10-19 10:17:56.000000000 +0200
  79 @@ -87,10 +87,10 @@
  80          }
  81
  82      private:
  83 +        mutable ReadWriteMutex mReadWriteMutex;
  84          std::string mNetworkInterface;
  85          std::vector<std::string> mAllowedIps;
  86          std::vector<u_long> mAllowedAddrs;
  87 -        mutable ReadWriteMutex mReadWriteMutex;
  88      };
  89
  90  } // namespace RCF
  91 diff -uNr RCF-0.4-orig/include/RCF/OpenSslEncryptionFilter.hpp RCF-0.4/include/RCF/OpenSslEncryptionFilter.hpp
  92 --- RCF-0.4-orig/include/RCF/OpenSslEncryptionFilter.hpp        2006-01-11 01:06:54.000000000 +0100
  93 +++ RCF-0.4/include/RCF/OpenSslEncryptionFilter.hpp     2006-10-19 10:44:20.000000000 +0200
  94 @@ -28,6 +28,8 @@
  95          SslClient
  96      };
  97
  98 +    class OpenSslEncryptionFilterImpl;
  99 +
 100      /// Filter implementing the SSL encryption protocol, through the OpenSSL library.
 101      class OpenSslEncryptionFilter : public IdentityFilter, boost::noncopyable
 102      {
 103 diff -uNr RCF-0.4-orig/include/RCF/PublishingService.hpp RCF-0.4/include/RCF/PublishingService.hpp
 104 --- RCF-0.4-orig/include/RCF/PublishingService.hpp      2006-07-27 23:30:10.000000000 +0200
 105 +++ RCF-0.4/include/RCF/PublishingService.hpp   2006-10-19 16:24:36.000000000 +0200
 106 @@ -15,6 +15,7 @@
 107  #include <boost/shared_ptr.hpp>
 108  #include <boost/utility.hpp>
 109
 110 +#include <RCF/ClientStub.hpp>
 111  #include <RCF/GetInterfaceName.hpp>
 112  #include <RCF/Service.hpp>
 113  #include <RCF/ThreadLibrary.hpp>
 114 diff -uNr RCF-0.4-orig/include/RCF/RcfServer.hpp RCF-0.4/include/RCF/RcfServer.hpp
 115 --- RCF-0.4-orig/include/RCF/RcfServer.hpp      2006-04-02 21:39:32.000000000 +0200
 116 +++ RCF-0.4/include/RCF/RcfServer.hpp   2006-10-19 16:26:26.000000000 +0200
 117 @@ -214,12 +214,12 @@
 118          ThreadSpecificSessionQueuePtr mThreadSpecificSessionQueuePtr;
 119          // eventually other specialized session queues...
 120
 121 -        volatile bool mServerThreadsStopFlag;
 122          Mutex mOpenedMutex;
 123          bool mOpened;
 124
 125          Mutex mStartedMutex;
 126          bool mStarted;
 127 +        volatile bool mServerThreadsStopFlag;
 128
 129      public:
 130
 131 diff -uNr RCF-0.4-orig/include/RCF/StubFactory.hpp RCF-0.4/include/RCF/StubFactory.hpp
 132 --- RCF-0.4-orig/include/RCF/StubFactory.hpp    2006-01-11 01:06:54.000000000 +0100
 133 +++ RCF-0.4/include/RCF/StubFactory.hpp 2006-10-19 10:28:45.000000000 +0200
 134 @@ -9,6 +9,7 @@
 135  #ifndef INCLUDE_RCF_STUBFACTORY_HPP
 136  #define INCLUDE_RCF_STUBFACTORY_HPP
 137
 138 +#include <RCF/ServerStub.hpp>
 139  #include <boost/shared_ptr.hpp>
 140
 141  namespace RCF {
 142 diff -uNr RCF-0.4-orig/include/RCF/SubscriptionService.hpp RCF-0.4/include/RCF/SubscriptionService.hpp
 143 --- RCF-0.4-orig/include/RCF/SubscriptionService.hpp    2006-07-27 23:30:10.000000000 +0200
 144 +++ RCF-0.4/include/RCF/SubscriptionService.hpp 2006-10-23 11:43:31.826971900 +0200
 145 @@ -19,6 +19,7 @@
 146
 147  #include <RCF/GetInterfaceName.hpp>
 148  #include <RCF/Service.hpp>
 149 +#include <RCF/ServerStub.hpp>
 150
 151  namespace RCF {
 152
 153 diff -uNr RCF-0.4-orig/include/RCF/TcpClientTransport.hpp RCF-0.4/include/RCF/TcpClientTransport.hpp
 154 --- RCF-0.4-orig/include/RCF/TcpClientTransport.hpp     2006-02-05 05:52:38.000000000 +0100
 155 +++ RCF-0.4/include/RCF/TcpClientTransport.hpp  2006-10-20 16:59:45.000000000 +0200
 156 @@ -93,7 +93,7 @@
 157      class TcpClientTransport : public I_ClientTransport
 158      {
 159      public:
 160 -        TcpClientTransport::TcpClientTransport(const TcpClientTransport &rhs);
 161 +        TcpClientTransport(const TcpClientTransport &rhs);
 162          TcpClientTransport(const std::string &ip, int port);
 163          TcpClientTransport(sockaddr_in remoteAddr);
 164          TcpClientTransport(int fd);
 165 @@ -131,8 +131,8 @@
 166          int fd;
 167          bool own;
 168
 169 -        std::size_t mBytesTransferred;
 170          int mError;
 171 +        std::size_t mBytesTransferred;
 172
 173          boost::shared_ptr< CloseFunctor > mCloseFunctor;
 174          std::vector<FilterPtr> mTransportFilters;
 175 diff -uNr RCF-0.4-orig/include/RCF/TcpServerTransport.hpp RCF-0.4/include/RCF/TcpServerTransport.hpp
 176 --- RCF-0.4-orig/include/RCF/TcpServerTransport.hpp     2006-02-07 21:37:16.000000000 +0100
 177 +++ RCF-0.4/include/RCF/TcpServerTransport.hpp  2006-10-20 17:27:25.000000000 +0200
 178 @@ -59,12 +59,12 @@
 179                  WritingData,
 180              };
 181
 182 +            Fd                  fd;
 183              State               state;
 184              std::vector<char>   readBuffer;
 185              std::size_t         readBufferRemaining;
 186              std::vector<char>   writeBuffer;
 187              std::size_t         writeBufferRemaining;
 188 -            Fd                  fd;
 189          };
 190
 191          typedef boost::shared_ptr<I_Session>        SessionPtr;
 192 diff -uNr RCF-0.4-orig/include/RCF/ZlibCompressionFilter.hpp RCF-0.4/include/RCF/ZlibCompressionFilter.hpp
 193 --- RCF-0.4-orig/include/RCF/ZlibCompressionFilter.hpp  2006-01-11 01:06:54.000000000 +0100
 194 +++ RCF-0.4/include/RCF/ZlibCompressionFilter.hpp       2006-10-23 16:29:58.698611358 +0200
 195 @@ -21,6 +21,9 @@
 196      static const int RCF_FILTER_ZLIB_COMPRESSION_STATELESS = 3;
 197
 198      static const int RCF_FILTER_ZLIB_COMPRESSION_STATEFUL = 4;
 199 +
 200 +    class ZlibCompressionReadFilter;
 201 +    class ZlibCompressionWriteFilter;
 202
 203      class ZlibCompressionFilter : public IdentityFilter, boost::noncopyable
 204      {
 205 diff -uNr RCF-0.4-orig/include/RCF/util/Platform/Machine/ByteOrder.hpp RCF-0.4/include/RCF/util/Platform/Machine/ByteOrder.hpp
 206 --- RCF-0.4-orig/include/RCF/util/Platform/Machine/ByteOrder.hpp        2006-09-13 17:02:32.000000000 +0200
 207 +++ RCF-0.4/include/RCF/util/Platform/Machine/ByteOrder.hpp     2006-10-24 17:40:39.917363264 +0200
 208 @@ -14,6 +14,8 @@
 209  #include "x86/ByteOrder.hpp"
 210  #elif defined(_M_IA64) || defined(_M_AMD64) || defined(_M_X64)
 211  #include "x86/ByteOrder.hpp"
 212 +#elif defined(_MIPSEL) && _MIPSEL == 1
 213 +#include "x86/ByteOrder.hpp"
 214  #else
 215  #include "UnknownMachine/ByteOrder.hpp"
 216  #endif
 217 diff -uNr RCF-0.4-orig/include/RCF/util/UnusedVariable.hpp RCF-0.4/include/RCF/util/UnusedVariable.hpp
 218 --- RCF-0.4-orig/include/RCF/util/UnusedVariable.hpp    2006-01-11 01:06:56.000000000 +0100
 219 +++ RCF-0.4/include/RCF/util/UnusedVariable.hpp 2006-10-20 17:40:00.000000000 +0200
 220 @@ -9,6 +9,10 @@
 221  #define INCLUDE_UTIL_UNUSEDVARIABLE_HPP
 222
 223  // Eliminate unused variable warnings, eg for scoped lock objects
 224 +#ifndef __GNUC__
 225  #define RCF_UNUSED_VARIABLE(x) ((void) x)
 226 +#else
 227 +#define RCF_UNUSED_VARIABLE(x)
 228 +#endif
 229
 230  #endif // ! INCLUDE_UTIL_UNUSEDVARIABLE_HPP
 231 diff -uNr RCF-0.4-orig/include/SF/I_Stream.hpp RCF-0.4/include/SF/I_Stream.hpp
 232 --- RCF-0.4-orig/include/SF/I_Stream.hpp        2006-01-11 01:07:00.000000000 +0100
 233 +++ RCF-0.4/include/SF/I_Stream.hpp     2006-10-19 10:12:54.000000000 +0200
 234 @@ -19,6 +19,7 @@
 235      class I_ContextRead
 236      {
 237      public:
 238 +        virtual ~I_ContextRead(void) {}
 239          virtual void add(SF::UInt32 nid, const ObjectId &id) = 0;
 240          virtual void add(void *ptr, const std::type_info &objType, void *pObj ) = 0;
 241          virtual bool query(SF::UInt32 nid, ObjectId &id) = 0;
 242 @@ -29,6 +30,7 @@
 243      class I_ContextWrite
 244      {
 245      public:
 246 +        virtual ~I_ContextWrite(void) {}
 247          virtual void setEnabled(bool enable) = 0;
 248          virtual bool getEnabled() = 0;
 249          virtual void add(const ObjectId &id, SF::UInt32 &nid) = 0;
 250 @@ -38,28 +40,33 @@
 251
 252      class I_WithContextRead {
 253      public:
 254 +        virtual ~I_WithContextRead(void) {}
 255          virtual I_ContextRead &getContext() = 0;
 256      };
 257
 258      class I_WithContextWrite {
 259      public:
 260 +        virtual ~I_WithContextWrite(void) {}
 261          virtual I_ContextWrite &getContext() = 0;
 262      };
 263
 264      class I_LocalStorage {
 265      public:
 266 +        virtual ~I_LocalStorage(void) {}
 267          virtual void set(const std::type_info &objType, void *) = 0;
 268          virtual void *get(const std::type_info &objType) = 0;
 269      };
 270
 271      class I_WithLocalStorage {
 272      public:
 273 +        virtual ~I_WithLocalStorage(void) {}
 274          virtual I_LocalStorage &getLocalStorage() = 0;
 275      };
 276
 277      class I_Encoding
 278      {
 279      public:
 280 +        virtual ~I_Encoding(void) {}
 281          virtual UInt32 getCount(DataPtr &data, const std::type_info &type) = 0;
 282          virtual void toData(DataPtr &data, void *pvObject, const std::type_info &type, int nCount) = 0;
 283          virtual void toObject(DataPtr &data, void *pvObject, const std::type_info &type, int nCount) = 0;
 284 @@ -68,6 +75,7 @@
 285      class I_WithEncoding
 286      {
 287      public:
 288 +        virtual ~I_WithEncoding(void) {}
 289          virtual I_Encoding &getEncoding() = 0;
 290      };
 291
 292 @@ -80,6 +88,7 @@
 293      class WithFormatWrite
 294      {
 295      public:
 296 +        virtual ~WithFormatWrite(void) {}
 297          virtual void begin(const Node &) = 0;
 298          virtual void put(const DataPtr &) = 0;
 299          virtual void end() = 0;
 300 @@ -88,6 +97,7 @@
 301      class WithFormatRead
 302      {
 303      public:
 304 +        virtual ~WithFormatRead(void) {}
 305          virtual bool begin(Node &) = 0;
 306          virtual bool get(DataPtr &) = 0;
 307          virtual void end() = 0;
 308 diff -uNr RCF-0.4-orig/include/SF/SerializeSmartPtr.hpp RCF-0.4/include/SF/SerializeSmartPtr.hpp
 309 --- RCF-0.4-orig/include/SF/SerializeSmartPtr.hpp       2006-01-19 07:44:30.000000000 +0100
 310 +++ RCF-0.4/include/SF/SerializeSmartPtr.hpp    2006-10-24 12:50:50.039809323 +0200
 311 @@ -20,7 +20,6 @@
 312      template< template<typename> class SmartPtr, typename T >
 313      inline bool serializeSimpleSmartPtr(SmartPtr<T> **pps, SF::Archive &ar)
 314      {
 315 -        bool bRet = false;
 316          if (ar.isRead()) {
 317              if (ar.isFlagSet(Archive::POINTER)) *pps = new SmartPtr<T>;
 318              T *pt = NULL;
 319 diff -uNr RCF-0.4-orig/include/SF/SerializeStaticArray.hpp RCF-0.4/include/SF/SerializeStaticArray.hpp
 320 --- RCF-0.4-orig/include/SF/SerializeStaticArray.hpp    2006-01-11 01:07:00.000000000 +0100
 321 +++ RCF-0.4/include/SF/SerializeStaticArray.hpp 2006-10-23 17:02:39.489476120 +0200
 322 @@ -2,6 +2,8 @@
 323  #ifndef INCLUDE_SF_SERIALIZESTATICARRAY_HPP
 324  #define INCLUDE_SF_SERIALIZESTATICARRAY_HPP
 325
 326 +#include <boost/type_traits.hpp>
 327 +
 328  #include <SF/Archive.hpp>
 329
 330  namespace SF {
 331 diff -uNr RCF-0.4-orig/include/SF/Stream.hpp RCF-0.4/include/SF/Stream.hpp
 332 --- RCF-0.4-orig/include/SF/Stream.hpp  2006-09-19 11:53:44.000000000 +0200
 333 +++ RCF-0.4/include/SF/Stream.hpp       2006-10-19 10:14:35.000000000 +0200
 334 @@ -221,7 +221,7 @@
 335      {
 336      public:
 337          OStream(std::ostream &os);
 338 -        UInt32 OStream::writeRaw(const Byte8 *pBytes, UInt32 nLength);
 339 +        UInt32 writeRaw(const Byte8 *pBytes, UInt32 nLength);
 340
 341      private:
 342          void begin(const Node &node);
 343 diff -uNr RCF-0.4-orig/include/SF/vector.hpp RCF-0.4/include/SF/vector.hpp
 344 --- RCF-0.4-orig/include/SF/vector.hpp  2006-09-19 11:53:46.000000000 +0200
 345 +++ RCF-0.4/include/SF/vector.hpp       2006-10-23 17:05:37.129355307 +0200
 346 @@ -7,6 +7,7 @@
 347  #include <SF/SerializeDynamicArray.hpp>
 348  #include <SF/SerializeStl.hpp>
 349  #include <SF/Tools.hpp>
 350 +#include <SF/Stream.hpp>
 351
 352  namespace SF {
 353
 354 diff -uNr RCF-0.4-orig/src/Makefile RCF-0.4/src/Makefile
 355 --- RCF-0.4-orig/src/Makefile   1970-01-01 01:00:00.000000000 +0100
 356 +++ RCF-0.4/src/Makefile        2006-10-24 16:08:09.684099349 +0200
 357 @@ -0,0 +1,29 @@
 358 +#
 359 +# Makefile for RCF library
 360 +#
 361 +# Martin Dietze <dietze@4g-systems.com>
 362 +#
 363 +
 364 +SUBDIRS = SF RCF
 365 +DESTDIR =
 366 +prefix = /usr/local
 367 +
 368 +.PHONY: all clean syntax shared install uninstall
 369 +
 370 +all:
 371 +       $(MAKE) -C RCF $@
 372 +
 373 +shared:
 374 +       $(MAKE) -C RCF $@
 375 +
 376 +install:
 377 +       $(MAKE) -C RCF $@
 378 +
 379 +uninstall:
 380 +       $(MAKE) -C RCF $@
 381 +
 382 +syntax:
 383 +       @for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit 1; done
 384 +
 385 +clean:
 386 +       @for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit 1; done
 387 diff -uNr RCF-0.4-orig/src/RCF/AsyncFilter.cpp RCF-0.4/src/RCF/AsyncFilter.cpp
 388 --- RCF-0.4-orig/src/RCF/AsyncFilter.cpp        2006-01-11 01:07:02.000000000 +0100
 389 +++ RCF-0.4/src/RCF/AsyncFilter.cpp     2006-10-19 10:00:18.000000000 +0200
 390 @@ -149,8 +149,8 @@
 391          ReadProxy(const std::string &buffer, FilterPtr filterPtr) :
 392              mBuffer(buffer),
 393              mchBuffer(mBuffer.c_str()),
 394 -            mchBufferLength( static_cast<int>(mBuffer.length()) ),
 395              mchBufferPos(),
 396 +            mchBufferLength( static_cast<int>(mBuffer.length()) ),
 397              mFilterPtr(filterPtr)
 398          {}
 399
 400 diff -uNr RCF-0.4-orig/src/RCF/Makefile RCF-0.4/src/RCF/Makefile
 401 --- RCF-0.4-orig/src/RCF/Makefile       1970-01-01 01:00:00.000000000 +0100
 402 +++ RCF-0.4/src/RCF/Makefile    2006-10-26 16:22:54.175209260 +0200
 403 @@ -0,0 +1,123 @@
 404 +#
 405 +# Makefile for RCF library
 406 +#
 407 +# Martin Dietze <dietze@4g-systems.com>
 408 +#
 409 +
 410 +MAJOR = 0
 411 +VERSION = $(MAJOR).4
 412 +
 413 +O = .o
 414 +A = .a
 415 +D = .so
 416 +
 417 +.PHONY: all clean shared install uninstall mt st shared-st shared-mt
 418 +
 419 +CXX = g++
 420 +#HAS_MM = yes
 421 +AR = ar
 422 +CDEFINES = -DRCF_USE_OPENSSL -DRCF_USE_ZLIB -DRCF_USE_SF_SERIALIZATION \
 423 +       -DRCF_USE_BOOST_ASIO
 424 +CPPFLAGS = -I../../include
 425 +CXXTHREADS = -DRCF_USE_BOOST_THREADS
 426 +CSHARED =
 427 +CXXFLAGS = -ansi -Wall -Werror -O3
 428 +DESTDIR =
 429 +prefix = /usr/local
 430 +
 431 +OBJS = AsyncFilter.o ByteOrdering.o CheckRtti.o ClientInfo.o ClientStub.o \
 432 +       ClientTransport.o CurrentSession.o EncodeMessage.o Endpoint.o \
 433 +       EndpointBrokerService.o EndpointServerService.o Exception.o \
 434 +       FilterService.o Idl.o InitDeinit.o IpAddress.o IpServerTransport.o \
 435 +       Marshal.o MethodInvocation.o MulticastClientTransport.o \
 436 +       ObjectFactoryService.o OpenSslEncryptionFilter.o Protocol/Protocol.o \
 437 +       PublishingService.o Random.o RcfClient.o RcfServer.o \
 438 +       SerializationProtocol.o ServerInterfaces.o ServerStub.o ServerTask.o \
 439 +       ServerTransport.o Service.o Session.o StubEntry.o StubFactory.o \
 440 +       SubscriptionService.o TcpAsioClientTransport.o \
 441 +       TcpAsioServerTransport.o TcpAsioSynchronizedSocket.o \
 442 +       TcpClientTransport.o TcpEndpoint.o \
 443 +       TcpServerTransport.o ThreadLibrary.o TimedBsdSockets.o Token.o \
 444 +       Tools.o UdpClientTransport.o UdpEndpoint.o UdpServerTransport.o \
 445 +       UsingBsdSockets.o UsingOpenSsl.o ZlibCompressionFilter.o
 446 +SOURCES = $(OBJS:%.o=%.cpp) RCF.cpp
 447 +NAME = libRCF
 448 +LIBMT = $(NAME)mt$A
 449 +LIBST = $(NAME)st$A
 450 +
 451 +all:
 452 +       $(MAKE) mt
 453 +       $(MAKE) st
 454 +
 455 +mt: $(LIBMT)
 456 +
 457 +st: $(LIBST)
 458 +
 459 +shared:
 460 +       $(MAKE) shared-mt
 461 +       $(MAKE) shared-st
 462 +
 463 +shared-mt:
 464 +       $(MAKE) -e LIBMT=$(NAME)mt$D CSHARED=-fPIC $(NAME)mt$D
 465 +
 466 +shared-st:
 467 +       $(MAKE) -e LIBST=$(NAME)st$D CSHARED=-fPIC $(NAME)st$D
 468 +
 469 +syntax: $(OBJS)
 470 +
 471 +install: $(LIBMT) $(LIBST)
 472 +       install -d -m 775 $(DESTDIR)$(prefix)/lib
 473 +       if [ -f $(NAME)mt$(A) ]; then \
 474 +         install -m 664 $(NAME)mt$(A) $(DESTDIR)$(prefix)/lib; \
 475 +       fi
 476 +       if [ -f $(NAME)st$(A) ]; then \
 477 +         install -m 664 $(NAME)st$(A) $(DESTDIR)$(prefix)/lib; \
 478 +       fi
 479 +       if [ -f $(NAME)mt$(D).$(VERSION) ]; then \
 480 +         install -m 775 $(NAME)mt$(D).$(VERSION) $(DESTDIR)$(prefix)/lib; \
 481 +         ln -sf $(NAME)mt$(D).$(VERSION) $(DESTDIR)$(prefix)/lib/$(NAME)mt$(D).$(MAJOR); \
 482 +         ln -sf $(NAME)mt$(D).$(MAJOR) $(DESTDIR)$(prefix)/lib/$(NAME)mt$(D); \
 483 +       fi
 484 +       if [ -f $(NAME)st$(D).$(VERSION) ]; then \
 485 +         install -m 775 $(NAME)st$(D).$(VERSION) $(DESTDIR)$(prefix)/lib; \
 486 +         ln -sf $(NAME)st$(D).$(VERSION) $(DESTDIR)$(prefix)/lib/$(NAME)st$(D).$(MAJOR); \
 487 +         ln -sf $(NAME)st$(D).$(MAJOR) $(DESTDIR)$(prefix)/lib/$(NAME)st$(D); \
 488 +       fi
 489 +       install -d -m 775 $(DESTDIR)$(prefix)/include
 490 +       cp -dpR ../../include/RCF $(DESTDIR)$(prefix)/include
 491 +       cp -dpR ../../include/SF $(DESTDIR)$(prefix)/include
 492 +
 493 +uninstall: $(PROGRAM)
 494 +       rm -f $(DESTDIR)$(prefix)/lib/$(NAME)[ms]t$A
 495 +       rm -f $(DESTDIR)$(prefix)/lib/$(NAME)[ms]t$D
 496 +       rm -f $(DESTDIR)$(prefix)/lib/$(NAME)[ms]t$D.$(MAJOR)
 497 +       rm -f $(DESTDIR)$(prefix)/lib/$(NAME)[ms]t$D.$(VERSION)
 498 +       rm -rf $(DESTDIR)$(prefix)/include/RCF
 499 +       rm -rf $(DESTDIR)$(prefix)/include/SF
 500 +
 501 +lib%$(A): %.o
 502 +       $(AR) cr $@ $^
 503 +
 504 +lib%$(D): %.o
 505 +       $(CXX) $^ -shared -Wl,-soname,$@.$(MAJOR) -o $@.$(VERSION)
 506 +       ln -sf $@.$(VERSION) $@.$(MAJOR)
 507 +       ln -sf $@.$(MAJOR) $@
 508 +
 509 +clean:
 510 +       rm -f $(NAME)[ms]t$(A) $(NAME)[ms]t$(D)* $(OBJS) RCF[ms]t.o *~ .depend
 511 +
 512 +%st.o: %.cpp
 513 +       $(CXX) -c $(CSHARED) $(CPPFLAGS) $(CDEFINES) $(CXXFLAGS) $< -o $@
 514 +
 515 +%mt.o: %.cpp
 516 +       $(CXX) -c $(CSHARED) $(CPPFLAGS) $(CDEFINES) $(CXXTHREADS) $(CXXFLAGS) $< -o $@
 517 +
 518 +%.o: %.cpp
 519 +       $(CXX) -c $(CSHARED) $(CPPFLAGS) $(CDEFINES) $(CXXTHREADS) $(CXXFLAGS) $< -o $@
 520 +
 521 +.depend: $(SOURCES)
 522 +       $(CXX) $(CPPFLAGS) $(CDEFINES) -MM $(SOURCES) >$@
 523 +
 524 +ifeq (yes,$(HAS_MM))
 525 +sinclude .depend
 526 +endif
 527 diff -uNr RCF-0.4-orig/src/RCF/MulticastClientTransport.cpp RCF-0.4/src/RCF/MulticastClientTransport.cpp
 528 --- RCF-0.4-orig/src/RCF/MulticastClientTransport.cpp   2006-01-18 08:32:18.000000000 +0100
 529 +++ RCF-0.4/src/RCF/MulticastClientTransport.cpp        2006-10-19 10:24:44.000000000 +0200
 530 @@ -25,11 +25,13 @@
 531      std::auto_ptr<I_ClientTransport> MulticastClientTransport::clone() const
 532      {
 533          RCF_THROW( ClientTransportException, "clone() not supported for MulticastClientTransport" );
 534 +        return std::auto_ptr<I_ClientTransport>(NULL); /* keep the compiler happy */
 535      }
 536
 537      EndpointPtr MulticastClientTransport::getEndpointPtr() const
 538      {
 539          RCF_THROW( ClientTransportException, "getEndpointPtr() not supported for MulticastClientTransport" );
 540 +        return EndpointPtr(); /* keep the compiler happy */
 541      }
 542
 543      int MulticastClientTransport::send(const std::string &data, unsigned int timeoutMs)
 544 @@ -70,6 +72,7 @@
 545      int MulticastClientTransport::receive(std::string &, unsigned int)
 546      {
 547          RCF_THROW( ClientTransportException, "receive() not supported for MulticastClientTransport" );
 548 +        return -1; /* keep the compiler happy */
 549      }
 550
 551      bool MulticastClientTransport::isConnected()
 552 diff -uNr RCF-0.4-orig/src/RCF/ObjectFactoryService.cpp RCF-0.4/src/RCF/ObjectFactoryService.cpp
 553 --- RCF-0.4-orig/src/RCF/ObjectFactoryService.cpp       2006-04-03 14:49:40.000000000 +0200
 554 +++ RCF-0.4/src/RCF/ObjectFactoryService.cpp    2006-10-19 10:30:26.000000000 +0200
 555 @@ -69,8 +69,8 @@
 556      }
 557
 558      ObjectFactoryService::ObjectFactoryService(unsigned int numberOfTokens, unsigned int clientStubTimeoutS) :
 559 -        mClientStubTimeoutS(clientStubTimeoutS),
 560          mTokenFactory(numberOfTokens),
 561 +        mClientStubTimeoutS(clientStubTimeoutS),
 562          mStubFactoryMapMutex(WriterPriority),
 563          mStopFlag()
 564      {
 565 @@ -260,6 +260,7 @@
 566              RcfClient<I_ObjectFactory> factory(clientStub.releaseTransport());
 567              //ScopeGuard guard( boost::bind(&reinstateClientTransport, boost::ref(clientStub), boost::ref(factory)) );
 568              ScopeGuard guard = MakeGuard(reinstateClientTransport, boost::ref(clientStub), boost::ref(factory));
 569 +            (void)guard; /* suppress unused var warning */
 570              RCF::Token token;
 571              bool ok = factory.createObject(RCF::Twoway, objectName, token);
 572              if (ok)
 573 diff -uNr RCF-0.4-orig/src/RCF/OpenSslEncryptionFilter.cpp RCF-0.4/src/RCF/OpenSslEncryptionFilter.cpp
 574 --- RCF-0.4-orig/src/RCF/OpenSslEncryptionFilter.cpp    2006-01-11 01:07:02.000000000 +0100
 575 +++ RCF-0.4/src/RCF/OpenSslEncryptionFilter.cpp 2006-10-19 10:47:36.000000000 +0200
 576 @@ -145,6 +145,9 @@
 577              sslRole(sslRole),
 578              certificateFile(certificateFile),
 579              certificateFilePassword(certificateFilePassword),
 580 +            preState(Ready),
 581 +            postState(Ready),
 582 +            retry(),
 583              preBuffer(),
 584              preBufferOrig(),
 585              preBufferLen(),
 586 @@ -152,11 +155,8 @@
 587              postBuffer(),
 588              postBufferLen(),
 589              postBufferRequested(),
 590 -            preState(Ready),
 591 -            postState(Ready),
 592 -            bioBufferSize(bioBufferSize),
 593 -            retry(),
 594              err(),
 595 +            bioBufferSize(bioBufferSize),
 596              openSslEncryptionFilter(openSslEncryptionFilter)
 597      {
 598          init();
 599 diff -uNr RCF-0.4-orig/src/RCF/TcpAsioServerTransport.cpp RCF-0.4/src/RCF/TcpAsioServerTransport.cpp
 600 --- RCF-0.4-orig/src/RCF/TcpAsioServerTransport.cpp     2006-07-28 23:10:12.000000000 +0200
 601 +++ RCF-0.4/src/RCF/TcpAsioServerTransport.cpp  2006-10-20 17:43:44.000000000 +0200
 602 @@ -20,10 +20,10 @@
 603  namespace RCF {
 604
 605      TcpAsioServerTransport::SessionState::SessionState(TcpAsioServerTransport &transport, DemuxerPtr demuxerPtr, ReadWriteMutexPtr readWriteMutexPtr) :
 606 -        mSynchronizedSocketPtr( new TcpAsioSynchronizedSocket(demuxerPtr, readWriteMutexPtr) ),
 607          mState(Ready),
 608          mReadBufferRemaining(),
 609          mWriteBufferRemaining(),
 610 +        mSynchronizedSocketPtr( new TcpAsioSynchronizedSocket(demuxerPtr, readWriteMutexPtr) ),
 611          mReflecting(),
 612          mTransport(transport)
 613      {
 614 @@ -596,11 +596,11 @@
 615
 616      TcpAsioServerTransport::TcpAsioServerTransport(int port) :
 617          mDemuxerPtr(),
 618 -        mCycleTimerPtr(),
 619 -        mInterrupt(),
 620          mReadWriteMutexPtr( new ReadWriteMutex(ReaderPriority) ),
 621          mPort(port),
 622          mAcceptorPtr(),
 623 +        mCycleTimerPtr(),
 624 +        mInterrupt(),
 625          mStopFlag(),
 626          pServer()
 627      {}
 628 diff -uNr RCF-0.4-orig/src/RCF/TcpClientTransport.cpp RCF-0.4/src/RCF/TcpClientTransport.cpp
 629 --- RCF-0.4-orig/src/RCF/TcpClientTransport.cpp 2006-07-27 23:30:14.000000000 +0200
 630 +++ RCF-0.4/src/RCF/TcpClientTransport.cpp      2006-10-20 17:05:35.000000000 +0200
 631 @@ -336,7 +336,7 @@
 632              bufferLen = static_cast<int>(vec.size());
 633              ret = timedReceive(buffer, bufferLen);
 634
 635 -            if (ret == length)
 636 +            if (ret == (int)length)
 637              {
 638                  data.clear();
 639                  data.append(&vec[0], length);
 640 diff -uNr RCF-0.4-orig/src/RCF/TcpServerTransport.cpp RCF-0.4/src/RCF/TcpServerTransport.cpp
 641 --- RCF-0.4-orig/src/RCF/TcpServerTransport.cpp 2006-01-11 01:07:02.000000000 +0100
 642 +++ RCF-0.4/src/RCF/TcpServerTransport.cpp      2006-10-20 17:38:55.000000000 +0200
 643 @@ -81,15 +81,15 @@
 644      }
 645
 646      TcpServerTransport::TcpServerTransport(int port /*= 0*/) :
 647 -        allowedIpsMutex(WriterPriority),
 648          FdPartitionCount(10),
 649          pSessionManager(),
 650 -        networkInterface("0.0.0.0"),
 651 -        maxPendingConnectionCount(100),
 652 -        port(port),
 653 -        selecting(),
 654 +        acceptorFd(-1),
 655          mStopFlag(),
 656 -        acceptorFd(-1)
 657 +        selecting(),
 658 +        allowedIpsMutex(WriterPriority),
 659 +        port(port),
 660 +        networkInterface("0.0.0.0"),
 661 +        maxPendingConnectionCount(100)
 662      {}
 663
 664      void TcpServerTransport::setSessionManager(I_SessionManager &sessionManager)
 665 @@ -256,7 +256,7 @@
 666              readBufferRemaining -= ret;
 667              return 0;
 668          }
 669 -        else if (ret == readBufferRemaining)
 670 +        else if (ret == (int)readBufferRemaining)
 671          {
 672              // full packet has now been read
 673              if (sessionState.state == SessionState::ReadingDataCount)
 674 diff -uNr RCF-0.4-orig/src/RCF/TimedBsdSockets.cpp RCF-0.4/src/RCF/TimedBsdSockets.cpp
 675 --- RCF-0.4-orig/src/RCF/TimedBsdSockets.cpp    2006-01-27 21:42:30.000000000 +0100
 676 +++ RCF-0.4/src/RCF/TimedBsdSockets.cpp 2006-10-20 17:37:39.000000000 +0200
 677 @@ -81,7 +81,7 @@
 678              RCF_ASSERT(ret != 0);
 679              if (ret > 0)
 680              {
 681 -                RCF_ASSERT(0 < ret && ret <= bytesRemaining);
 682 +                RCF_ASSERT(0 < ret && ret <= (int)bytesRemaining);
 683                  bytesRemaining -= ret;
 684                  bytesSent += ret;
 685                  if (bytesRemaining == 0)
 686 diff -uNr RCF-0.4-orig/src/RCF/UdpServerTransport.cpp RCF-0.4/src/RCF/UdpServerTransport.cpp
 687 --- RCF-0.4-orig/src/RCF/UdpServerTransport.cpp 2006-02-14 15:23:26.000000000 +0100
 688 +++ RCF-0.4/src/RCF/UdpServerTransport.cpp      2006-10-20 17:40:22.000000000 +0200
 689 @@ -18,8 +18,8 @@
 690          pSessionManager(),
 691          port(port),
 692          fd(-1),
 693 -        pollingDelayMs(),
 694 -        mStopFlag()
 695 +        mStopFlag(),
 696 +        pollingDelayMs()
 697      {
 698      }
 699
 700 @@ -193,7 +193,7 @@
 701          *(int *)(&writeBuffer[0]) = dataLength;
 702          const sockaddr_in &remoteAddr = sessionStatePtr->remoteAddress.getSockAddr();
 703          int len = sendto(fd, &writeBuffer[0], static_cast<int>(writeBuffer.size()), 0, (const sockaddr *) &remoteAddr, sizeof(remoteAddr));
 704 -        if (len != writeBuffer.size())
 705 +        if (len != (int)writeBuffer.size())
 706          {
 707              RCF_THROW(ServerTransportException, "sendto() failed")(fd)(len)(writeBuffer.size());
 708          }
 709 diff -uNr RCF-0.4-orig/src/RCF/ZlibCompressionFilter.cpp RCF-0.4/src/RCF/ZlibCompressionFilter.cpp
 710 --- RCF-0.4-orig/src/RCF/ZlibCompressionFilter.cpp      2006-01-11 01:07:02.000000000 +0100
 711 +++ RCF-0.4/src/RCF/ZlibCompressionFilter.cpp   2006-10-23 16:46:50.059387129 +0200
 712 @@ -67,14 +67,14 @@
 713
 714      ZlibCompressionReadFilter::ZlibCompressionReadFilter(ZlibCompressionFilter &filter, int bufferSize) :
 715          filter(filter),
 716 +        d_stream_(),
 717 +        mBuffer(bufferSize),
 718          preBuffer(),
 719          preBufferLen(),
 720          preBufferOrig(),
 721          preBufferLenOrig(),
 722          postBuffer(),
 723          postBufferLen(),
 724 -        mBuffer(bufferSize),
 725 -        d_stream_(),
 726          zerr_(Z_OK),
 727          err(),
 728          decompressionStateInited()
 729 @@ -170,14 +170,14 @@
 730
 731      ZlibCompressionWriteFilter::ZlibCompressionWriteFilter(ZlibCompressionFilter &filter, int bufferSize, bool stateful) :
 732          filter(filter),
 733 +        c_stream_(),
 734 +        mBuffer(bufferSize),
 735          preBuffer(),
 736          preBufferLen(),
 737          preBufferOrig(),
 738          preBufferLenOrig(),
 739          postBuffer(),
 740          postBufferLen(),
 741 -        mBuffer(bufferSize),
 742 -        c_stream_(),
 743          zerr_(Z_OK),
 744          err(),
 745          compressionStateInited(),
 746 diff -uNr RCF-0.4-orig/src/SF/Makefile RCF-0.4/src/SF/Makefile
 747 --- RCF-0.4-orig/src/SF/Makefile        1970-01-01 01:00:00.000000000 +0100
 748 +++ RCF-0.4/src/SF/Makefile     2006-10-24 17:43:53.113922445 +0200
 749 @@ -0,0 +1,54 @@
 750 +#
 751 +# Makefile for SF source files
 752 +# (for syntax check, i.e. to compile all sources separately)
 753 +#
 754 +# Martin Dietze <dietze@4g-systems.com>
 755 +#
 756 +
 757 +O = .o
 758 +A = .a
 759 +D = .so
 760 +
 761 +.PHONY: all clean shared syntax
 762 +
 763 +CXX = g++
 764 +#HAS_MM = yes
 765 +AR = ar
 766 +CDEFINES = -DRCF_USE_OPENSSL -DRCF_USE_ZLIB -DRCF_USE_SF_SERIALIZATION \
 767 +       -DRCF_USE_BOOST_ASIO
 768 +CPPFLAGS = -I../../include
 769 +CXXTHREADS = -DRCF_USE_BOOST_THREADS
 770 +CSHARED =
 771 +CXXFLAGS = -ansi -Wall -Werror -O3
 772 +prefix = /usr/local
 773 +
 774 +OBJS = Archive.o DataPtr.o deque.o Encoding.o Exception.o IBinaryStream.o \
 775 +       INativeBinaryStream.o ITextStream.o I_Stream.o list.o map.o memory.o \
 776 +       Node.o OBinaryStream.o ONativeBinaryStream.o OTextStream.o \
 777 +       PortableTypes.o Registry.o scoped_ptr.o SerializeDynamicArray.o \
 778 +       SerializeFundamental.o SerializePolymorphic.o Serializer.o \
 779 +       SerializeSmartPtr.o SerializeStaticArray.o SerializeStl.o set.o \
 780 +       SfNew.o shared_ptr.o Stream.o string.o Tools.o vector.o
 781 +SOURCES = $(OBJS:%.o=%.cpp)
 782 +
 783 +all:
 784 +       @echo "Nothing do be done for $@ in SF. Run $(MAKE) in the ../RCF directory."
 785 +
 786 +
 787 +shared:
 788 +       @echo "Nothing do be done for $@ in SF. Run $(MAKE) in the ../RCF directory."
 789 +
 790 +syntax: $(OBJS)
 791 +
 792 +clean:
 793 +       rm -f $(OBJS) *~ .depend
 794 +
 795 +%.o: %.cpp
 796 +       $(CXX) -c $(CSHARED) $(CPPFLAGS) $(CDEFINES) $(CXXTHREADS) $(CXXFLAGS) $< -o $@
 797 +
 798 +.depend: $(SOURCES)
 799 +       $(CXX) $(CPPFLAGS) $(CDEFINES) -MM $(SOURCES) >$@
 800 +
 801 +ifeq (yes,$(HAS_MM))
 802 +sinclude .depend
 803 +endif
 804 Binary files RCF-0.4-orig/src/SF/libSF.a and RCF-0.4/src/SF/libSF.a differ
 805 diff -uNr RCF-0.4-orig/test/Makefile RCF-0.4/test/Makefile
 806 --- RCF-0.4-orig/test/Makefile  1970-01-01 01:00:00.000000000 +0100
 807 +++ RCF-0.4/test/Makefile       2006-10-24 17:44:01.690302364 +0200
 808 @@ -0,0 +1,163 @@
 809 +#
 810 +# Makefile for RCF test programs
 811 +#
 812 +# Martin Dietze <dietze@4g-systems.com>
 813 +#
 814 +
 815 +O = .o
 816 +A = .a
 817 +D = .so
 818 +
 819 +.PHONY: all clean syntax test test-rcs-multi test-rcs-single test-rcs-filters
 820 +
 821 +CXX = g++
 822 +#HAS_MM = yes
 823 +AR = ar
 824 +CDEFINES = -DRCF_USE_OPENSSL -DRCF_USE_ZLIB -DRCF_USE_SF_SERIALIZATION \
 825 +       -DRCF_USE_BOOST_ASIO
 826 +CPPFLAGS = -I../include
 827 +CXXTHREADS = -DRCF_USE_BOOST_THREADS
 828 +CXXFLAGS = -ansi -Wall -Wno-unused-function -Werror -O3
 829 +LDFLAGS = -L../src/RCF
 830 +LIBSMT = -lRCFmt -lboost_thread -lz -lssl
 831 +LIBSST = -lRCFst -lboost_thread -lz -lssl
 832 +
 833 +PROGRAMS = Test_Binding Test_ClientConnectionDrop Test_ClientInfo \
 834 +       Test_ClientTimeout Test_Client_Minimal Test_Client_Performance \
 835 +       Test_CycleServer_St Test_CycleServer_Mt Test_Endpoint \
 836 +       Test_FilterPerformance Test_Filters Test_General Test_Inheritance \
 837 +       Test_InitDeinit Test_IpRestriction Test_Minimal \
 838 +       Test_MultiThreadedServer Test_MultipleClient Test_NetworkPerformance \
 839 +       Test_Notification Test_ObjectFactoryService Test_Performance \
 840 +       Test_Polymorphic Test_Serialization Test_Server_Minimal \
 841 +       Test_Server_Performance Test_SingleThreadedServer Test_StubSerialization
 842 +OBJS = $(PROGRAMS:%=%.o) Test_SingleThreadedServer_St.o
 843 +SOURCES = $(OBJS:%.o=%.cpp)
 844 +NAME = libRCF
 845 +LIB = $(NAME)$A
 846 +
 847 +test: all
 848 +       @echo "From ze test its beginnink:"
 849 +       $(MAKE) test-rcs-multi test-rcs-single
 850 +       @if [ -f client.pem ] && [ -f server.pem ]; then \
 851 +               echo $(MAKE) test-rcs-filters; \
 852 +               $(MAKE) test-rcs-filters; \
 853 +       else \
 854 +               echo "client.pem and/or server.pem not found, skipping filter tests."; \
 855 +       fi
 856 +       @echo "Not run automatically:"
 857 +       @echo "./Test_Client_Minimal"
 858 +       @echo "./Test_Server_Minimal"
 859 +       @echo "./Test_Client_Performance"
 860 +       @echo "./Test_Server_Performance"
 861 +       @echo "./Test_NetworkPerformance"
 862 +       @echo "From ze test its end."
 863 +
 864 +
 865 +test-rcs-multi:
 866 +       ./Test_Binding
 867 +       ./Test_ClientConnectionDrop
 868 +       ./Test_ClientInfo
 869 +       ./Test_ClientTimeout
 870 +       ./Test_CycleServer_Mt
 871 +       ./Test_Endpoint
 872 +       ./Test_General
 873 +       ./Test_Inheritance
 874 +       ./Test_InitDeinit
 875 +       ./Test_IpRestriction
 876 +       ./Test_Minimal
 877 +       ./Test_MultipleClient
 878 +       ./Test_MultiThreadedServer
 879 +       ./Test_Notification
 880 +       ./Test_ObjectFactoryService
 881 +       ./Test_Performance
 882 +       ./Test_Polymorphic
 883 +       ./Test_Serialization
 884 +       ./Test_StubSerialization
 885 +
 886 +test-rcs-single:
 887 +       ./Test_SingleThreadedServer
 888 +       ./Test_CycleServer_St
 889 +
 890 +test-rcs-filters:
 891 +       ./Test_FilterPerformance
 892 +       ./Test_Filters
 893 +
 894 +all: $(PROGRAMS)
 895 +
 896 +Test_Binding: Test_Binding.o
 897 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 898 +Test_ClientConnectionDrop: Test_ClientConnectionDrop.o
 899 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 900 +Test_ClientInfo: Test_ClientInfo.o
 901 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 902 +Test_ClientTimeout: Test_ClientTimeout.o
 903 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 904 +Test_Client_Minimal: Test_Client_Minimal.o
 905 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 906 +Test_Client_Performance: Test_Client_Performance.o
 907 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 908 +Test_CycleServer_Mt: Test_CycleServer_Mt.o
 909 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 910 +Test_Endpoint: Test_Endpoint.o
 911 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 912 +Test_FilterPerformance: Test_FilterPerformance.o
 913 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 914 +Test_Filters: Test_Filters.o
 915 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 916 +Test_General: Test_General.o
 917 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 918 +Test_Inheritance: Test_Inheritance.o
 919 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 920 +Test_InitDeinit: Test_InitDeinit.o
 921 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 922 +Test_IpRestriction: Test_IpRestriction.o
 923 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 924 +Test_Minimal: Test_Minimal.o
 925 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 926 +Test_MultiThreadedServer: Test_MultiThreadedServer.o
 927 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 928 +Test_MultipleClient: Test_MultipleClient.o
 929 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 930 +Test_NetworkPerformance: Test_NetworkPerformance.o
 931 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 932 +Test_Notification: Test_Notification.o
 933 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 934 +Test_ObjectFactoryService: Test_ObjectFactoryService.o
 935 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 936 +Test_Performance: Test_Performance.o
 937 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 938 +Test_Polymorphic: Test_Polymorphic.o
 939 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 940 +Test_Serialization: Test_Serialization.o
 941 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 942 +Test_Server_Minimal: Test_Server_Minimal.o
 943 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 944 +Test_Server_Performance: Test_Server_Performance.o
 945 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 946 +Test_StubSerialization: Test_StubSerialization.o
 947 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBSMT)
 948 +
 949 +Test_SingleThreadedServer: Test_SingleThreadedServer_St.o
 950 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGSST) $(LIBSST)
 951 +Test_CycleServer_St: Test_CycleServer_St.o
 952 +       $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGSST) $(LIBSST)
 953 +
 954 +clean:
 955 +       rm -f $(PROGRAMS) $(OBJS) *~ .depend
 956 +
 957 +%_St.o: %.cpp
 958 +       $(CXX) -c $(CPPFLAGS) $(CDEFINES) $(CXXFLAGS) $< -o $@
 959 +
 960 +%_Mt.o: %.cpp
 961 +       $(CXX) -c $(CPPFLAGS) $(CDEFINES) $(CXXFLAGS) $(CXXTHREADS) $< -o $@
 962 +
 963 +%.o: %.cpp
 964 +       $(CXX) -c $(CPPFLAGS) $(CDEFINES) $(CXXFLAGS) $(CXXTHREADS) $< -o $@
 965 +
 966 +.depend: $(SOURCES)
 967 +       $(CXX) $(CPPFLAGS) $(CDEFINES) -MM $(SOURCES) >$@
 968 +
 969 +ifeq (yes,$(HAS_MM))
 970 +sinclude .depend
 971 +endif
 972 diff -uNr RCF-0.4-orig/test/Test_Binding.cpp RCF-0.4/test/Test_Binding.cpp
 973 --- RCF-0.4-orig/test/Test_Binding.cpp  2006-02-07 21:37:18.000000000 +0100
 974 +++ RCF-0.4/test/Test_Binding.cpp       2006-10-24 10:43:51.099624209 +0200
 975 @@ -25,7 +25,7 @@
 976
 977      util::CommandLine::getSingleton().parse(argc, argv);
 978
 979 -    for (int i=0; i<RCF::getTransportFactories().size(); ++i)
 980 +    for (int i=0; i<(int)RCF::getTransportFactories().size(); ++i)
 981      {
 982          RCF::TransportFactoryPtr transportFactoryPtr = RCF::getTransportFactories()[i];
 983          std::pair<RCF::ServerTransportPtr, RCF::ClientTransportAutoPtrPtr> transports = transportFactoryPtr->createTransports();
 984 diff -uNr RCF-0.4-orig/test/Test_ClientConnectionDrop.cpp RCF-0.4/test/Test_ClientConnectionDrop.cpp
 985 --- RCF-0.4-orig/test/Test_ClientConnectionDrop.cpp     2006-07-30 12:03:52.000000000 +0200
 986 +++ RCF-0.4/test/Test_ClientConnectionDrop.cpp  2006-10-24 11:08:26.273040553 +0200
 987 @@ -29,7 +29,7 @@
 988
 989      util::CommandLine::getSingleton().parse(argc, argv);
 990
 991 -    for (int i=0; i<RCF::getTransportFactories().size(); ++i)
 992 +    for (int i=0; i<(int)RCF::getTransportFactories().size(); ++i)
 993      {
 994          RCF::TransportFactoryPtr transportFactoryPtr = RCF::getTransportFactories()[i];
 995          std::pair<RCF::ServerTransportPtr, RCF::ClientTransportAutoPtrPtr> transports = transportFactoryPtr->createTransports();
 996 diff -uNr RCF-0.4-orig/test/Test_ClientInfo.cpp RCF-0.4/test/Test_ClientInfo.cpp
 997 --- RCF-0.4-orig/test/Test_ClientInfo.cpp       2006-01-10 19:56:54.000000000 +0100
 998 +++ RCF-0.4/test/Test_ClientInfo.cpp    2006-10-24 11:23:39.441333027 +0200
 999 @@ -35,7 +35,7 @@
1000
1001      util::CommandLine::getSingleton().parse(argc, argv);
1002
1003 -    for (int i=0; i<RCF::getIpTransportFactories().size(); ++i)
1004 +    for (int i=0; i<(int)RCF::getIpTransportFactories().size(); ++i)
1005      {
1006          RCF::TransportFactoryPtr transportFactoryPtr = RCF::getTransportFactories()[i];
1007          std::pair<RCF::ServerTransportPtr, RCF::ClientTransportAutoPtrPtr> transports = transportFactoryPtr->createTransports();
1008 diff -uNr RCF-0.4-orig/test/Test_ClientTimeout.cpp RCF-0.4/test/Test_ClientTimeout.cpp
1009 --- RCF-0.4-orig/test/Test_ClientTimeout.cpp    2006-03-25 23:37:02.000000000 +0100
1010 +++ RCF-0.4/test/Test_ClientTimeout.cpp 2006-10-24 11:25:10.069308213 +0200
1011 @@ -44,7 +44,7 @@
1012  {
1013      util::CommandLine::getSingleton().parse(argc, argv);
1014
1015 -    for (int i=0; i<RCF::getTransportFactories().size(); ++i)
1016 +    for (int i=0; i<(int)RCF::getTransportFactories().size(); ++i)
1017      {
1018          RCF::TransportFactoryPtr transportFactoryPtr = RCF::getTransportFactories()[i];
1019          std::pair<RCF::ServerTransportPtr, RCF::ClientTransportAutoPtrPtr> transports = transportFactoryPtr->createTransports();
1020 diff -uNr RCF-0.4-orig/test/Test_CycleServer.cpp RCF-0.4/test/Test_CycleServer.cpp
1021 --- RCF-0.4-orig/test/Test_CycleServer.cpp      2006-01-04 08:55:06.000000000 +0100
1022 +++ RCF-0.4/test/Test_CycleServer.cpp   2006-10-24 11:36:36.003409416 +0200
1023 @@ -46,7 +46,7 @@
1024  {
1025      util::CommandLine::getSingleton().parse(argc, argv);
1026
1027 -    for (int i=0; i<RCF::getTransportFactories().size(); ++i)
1028 +    for (int i=0; i<(int)RCF::getTransportFactories().size(); ++i)
1029      {
1030
1031          RCF::TransportFactoryPtr transportFactoryPtr = RCF::getTransportFactories()[i];
1032 @@ -107,7 +107,7 @@
1033              serverThread.reset( new boost::thread( boost::bind(serverThreadTask, boost::ref(server)) ) );
1034              server.addJoinFunctor(joinServerThread);
1035
1036 -            for (int i=0; i<numberOfTokens; ++i)
1037 +            for (int i=0; i<(int)numberOfTokens; ++i)
1038              {
1039                  bool ok = RCF::createRemoteObject<I_Echo>(myClient);
1040                  BOOST_CHECK(ok);
1041 @@ -118,7 +118,7 @@
1042
1043              Platform::OS::Sleep(5);
1044
1045 -            for (int i=0; i<numberOfTokens; ++i)
1046 +            for (int i=0; i<(int)numberOfTokens; ++i)
1047              {
1048                  bool ok = RCF::createRemoteObject<I_Echo>(myClient);
1049                  BOOST_CHECK(ok);
1050 diff -uNr RCF-0.4-orig/test/Test_Endpoint.cpp RCF-0.4/test/Test_Endpoint.cpp
1051 --- RCF-0.4-orig/test/Test_Endpoint.cpp 2006-02-07 21:37:18.000000000 +0100
1052 +++ RCF-0.4/test/Test_Endpoint.cpp      2006-10-24 11:25:06.821165733 +0200
1053 @@ -52,7 +52,7 @@
1054
1055      util::CommandLine::getSingleton().parse(argc, argv);
1056
1057 -    for (int i=0; i<RCF::getTransportFactories().size(); ++i)
1058 +    for (int i=0; i<(int)RCF::getTransportFactories().size(); ++i)
1059      {
1060          RCF::TransportFactoryPtr transportFactoryPtr = RCF::getTransportFactories()[i];
1061          std::pair<RCF::ServerTransportPtr, RCF::ClientTransportAutoPtrPtr> transports;
1062 diff -uNr RCF-0.4-orig/test/Test_Filters.cpp RCF-0.4/test/Test_Filters.cpp
1063 --- RCF-0.4-orig/test/Test_Filters.cpp  2006-04-03 20:33:04.000000000 +0200
1064 +++ RCF-0.4/test/Test_Filters.cpp       2006-10-24 11:53:08.334995214 +0200
1065 @@ -65,21 +65,21 @@
1066      {
1067          RcfClient<X> client(clientTransportAutoPtr->clone());
1068
1069 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+1 );
1070 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+2 );
1071 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+1 );
1072 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+2 );
1073
1074          client.getClientStub().setTransportFilters(filterChains[i]);
1075
1076 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+3 );
1077 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+4 );
1078 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+3 );
1079 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+4 );
1080
1081          if (removable)
1082          {
1083              client.getClientStub().setTransportFilters(std::vector<RCF::FilterPtr>());
1084          }
1085
1086 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+5 );
1087 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+6 );
1088 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+5 );
1089 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+6 );
1090      }
1091
1092  }
1093 @@ -133,18 +133,18 @@
1094          const std::vector<RCF::FilterPtr> &filterChain = filterChains[i];
1095
1096          RcfClient<X> client(clientEndpoint);
1097 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+1 );
1098 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+1 );
1099
1100          client.getClientStub().setPayloadFilters(filterChain);
1101 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+2 );
1102 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+3 );
1103 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+2 );
1104 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+3 );
1105
1106          client.getClientStub().setPayloadFilters(std::vector<RCF::FilterPtr>());
1107 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+4 );
1108 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+4 );
1109
1110          client.getClientStub().setPayloadFilters(filterChain);
1111 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+5 );
1112 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+6 );
1113 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+5 );
1114 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+6 );
1115      }
1116
1117  }
1118 @@ -186,18 +186,18 @@
1119          const std::vector<RCF::FilterPtr> &filterChain = filterChains[i];
1120
1121          RcfClient<X> client(clientEndpoint);
1122 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+1 );
1123 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+1 );
1124
1125          client.getClientStub().setPayloadFilters(filterChain);
1126 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+2 );
1127 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+3 );
1128 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+2 );
1129 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+3 );
1130
1131          client.getClientStub().setPayloadFilters(std::vector<RCF::FilterPtr>());
1132 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+4 );
1133 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+4 );
1134
1135          client.getClientStub().setPayloadFilters(filterChain);
1136 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+5 );
1137 -        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*i+6 );
1138 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+5 );
1139 +        ret = client.func(RCF::Twoway); BOOST_CHECK( ret == 6*(int)i+6 );
1140      }
1141
1142  }
1143 diff -uNr RCF-0.4-orig/test/Test_Inheritance.cpp RCF-0.4/test/Test_Inheritance.cpp
1144 --- RCF-0.4-orig/test/Test_Inheritance.cpp      2006-01-27 21:42:32.000000000 +0100
1145 +++ RCF-0.4/test/Test_Inheritance.cpp   2006-10-24 12:20:07.734199170 +0200
1146 @@ -8,6 +8,7 @@
1147  #include <RCF/util/CommandLine.hpp>
1148  #include <RCF/util/PortNumbers.hpp>
1149
1150 +/*
1151  // interface inheritance hierarchies
1152  //
1153  //A1 <- B1 <- C1 <-
1154 @@ -23,6 +24,7 @@
1155  //A1 <- Y <-
1156  //
1157  // I_E <- E
1158 +*/
1159
1160  RCF_BEGIN(A1, "A1")
1161      RCF_METHOD_R0(std::string, funcA1)
1162 diff -uNr RCF-0.4-orig/test/Test_IpRestriction.cpp RCF-0.4/test/Test_IpRestriction.cpp
1163 --- RCF-0.4-orig/test/Test_IpRestriction.cpp    2006-02-07 21:37:18.000000000 +0100
1164 +++ RCF-0.4/test/Test_IpRestriction.cpp 2006-10-24 12:27:45.390368243 +0200
1165 @@ -33,7 +33,6 @@
1166      util::CommandLine::getSingleton().parse(argc, argv);
1167
1168      std::string localIp = "localhost";
1169 -    int localPort = 0;
1170
1171      for (unsigned int i=0; i<RCF::getIpTransportFactories().size(); ++i)
1172      {
1173 diff -uNr RCF-0.4-orig/test/Test_NetworkPerformance.cpp RCF-0.4/test/Test_NetworkPerformance.cpp
1174 --- RCF-0.4-orig/test/Test_NetworkPerformance.cpp       2006-03-20 15:48:54.000000000 +0100
1175 +++ RCF-0.4/test/Test_NetworkPerformance.cpp    2006-10-24 12:33:16.053031974 +0200
1176 @@ -222,4 +222,5 @@
1177          RCF_VERIFY(0, "no protocol specified");
1178      }
1179
1180 -}
1181 \ No newline at end of file
1182 +}
1183 +
1184 diff -uNr RCF-0.4-orig/test/Test_Notification.cpp RCF-0.4/test/Test_Notification.cpp
1185 --- RCF-0.4-orig/test/Test_Notification.cpp     2006-03-19 13:20:04.000000000 +0100
1186 +++ RCF-0.4/test/Test_Notification.cpp  2006-10-24 12:34:35.896571773 +0200
1187 @@ -127,9 +127,9 @@
1188
1189              for (unsigned int k=0; k<events.size(); ++k)
1190              {
1191 -                BOOST_CHECK(events[k].nA == k);
1192 -                BOOST_CHECK(events[k].nB == k);
1193 -                BOOST_CHECK(events[k].nC == k);
1194 +                BOOST_CHECK(events[k].nA == (int)k);
1195 +                BOOST_CHECK(events[k].nB == (int)k);
1196 +                BOOST_CHECK(events[k].nC == (int)k);
1197              }
1198          }
1199
1200 diff -uNr RCF-0.4-orig/test/Test_ObjectFactoryService.cpp RCF-0.4/test/Test_ObjectFactoryService.cpp
1201 --- RCF-0.4-orig/test/Test_ObjectFactoryService.cpp     2006-04-02 22:29:52.000000000 +0200
1202 +++ RCF-0.4/test/Test_ObjectFactoryService.cpp  2006-10-24 12:37:14.587606124 +0200
1203 @@ -78,7 +78,7 @@
1204          BOOST_CHECK( s == s0 );
1205          BOOST_CHECK(token != RCF::Token());
1206
1207 -        for (int j=0; j<numberOfTokens-1;++j)
1208 +        for (int j=0; j<(int)numberOfTokens-1;++j)
1209          {
1210              ok = RCF::createRemoteObject<I_Echo>(client);
1211              BOOST_CHECK(ok);
1212 diff -uNr RCF-0.4-orig/test/Test_Polymorphic.cpp RCF-0.4/test/Test_Polymorphic.cpp
1213 --- RCF-0.4-orig/test/Test_Polymorphic.cpp      2006-04-03 14:33:42.000000000 +0200
1214 +++ RCF-0.4/test/Test_Polymorphic.cpp   2006-10-24 12:45:11.860774284 +0200
1215 @@ -288,7 +288,7 @@
1216                  spa = zClient.f2( typeid(C).name() ); BOOST_CHECK( dynamic_cast<C *>(spa.get()) != NULL );
1217              }
1218              {
1219 -                A *pa = NULL;
1220 +                //A *pa = NULL;
1221                  //xClient.f3(typeid(B).name(), pa); BOOST_CHECK( dynamic_cast<B *>(pa) != NULL );
1222                  //xClient.f3(typeid(C).name(), pa); BOOST_CHECK( dynamic_cast<C *>(pa) != NULL );
1223
1224 diff -uNr RCF-0.4-orig/test/Test_Serialization.cpp RCF-0.4/test/Test_Serialization.cpp
1225 --- RCF-0.4-orig/test/Test_Serialization.cpp    2006-04-03 15:33:56.000000000 +0200
1226 +++ RCF-0.4/test/Test_Serialization.cpp 2006-10-24 12:49:32.708372131 +0200
1227 @@ -507,7 +507,7 @@
1228
1229      // Single dimensional static array
1230      int pn1[SIZE];
1231 -    for (int i=0;i<SIZE;i++)
1232 +    for (int i=0;i<(int)SIZE;i++)
1233          pn1[i] = i-20;
1234
1235      int pn2[SIZE];
1236 diff -uNr RCF-0.4-orig/test/port.txt RCF-0.4/test/port.txt
1237 --- RCF-0.4-orig/test/port.txt  1970-01-01 01:00:00.000000000 +0100
1238 +++ RCF-0.4/test/port.txt       2006-10-24 15:51:18.531284783 +0200
1239 @@ -0,0 +1 @@
1240 +50271
1241 \ No newline at end of file