Fixed compilation errors with GCC 4.3 by adding missing includes

and renaming templates: MaxBits to MaxBitsT, Mask to MaskT,
Compare<Edition> to CompareEd.

diff --git a/zypp/Bit.h b/zypp/Bit.h
index bf4caa3e96e0a2a5e26f7a34a5ea09ac4fec1f59..fc4899724ebad4d4bdf2d3e5e6a46d04922f4b7b 100644 (file)
--- a/zypp/Bit.h
+++ b/zypp/Bit.h
@@ -48,7 +48,7 @@ namespace zypp
 
     /** Number of bits available in \a _IntT. */
     template<class _IntT>
-      struct MaxBits
+      struct MaxBitsT
       {
         typedef _IntT IntT;
         static const unsigned value = (sizeof(IntT)*8);
@@ -58,8 +58,8 @@ namespace zypp
     template<class _IntT>
       inline std::string asString( _IntT val, char zero = '0', char one = '1' )
       {
-        std::string s( MaxBits<_IntT>::value, zero );
-        for( unsigned i = MaxBits<_IntT>::value; i; )
+        std::string s( MaxBitsT<_IntT>::value, zero );
+        for( unsigned i = MaxBitsT<_IntT>::value; i; )
           {
             --i;
             if ( val & (_IntT)1 )
@@ -71,7 +71,7 @@ namespace zypp
 
     /** A bitmaks of \a _size 1-bits starting at bit \a _begin. */
     template<class _IntT, unsigned _begin, unsigned _size>
-      struct Mask
+      struct MaskT
       {
         typedef _IntT IntT;
         static const IntT value    = bit_detail::Gen1Bits<IntT,_size>::value << _begin;
@@ -83,8 +83,8 @@ namespace zypp
       struct Range
       {
         typedef _IntT IntT;
-        typedef MaxBits<IntT>           MaxBits;
-        typedef Mask<IntT,_begin,_size> Mask;
+        typedef MaxBitsT<IntT>          MaxBits;
+        typedef MaskT<IntT,_begin,_size> Mask;
 
         static const unsigned begin  = _begin;
         static const unsigned size   = _size;
@@ -158,7 +158,7 @@ namespace zypp
      * \endcode
     */
     template<class _IntT>
-      class BitField  : public Range<_IntT, 0, MaxBits<_IntT>::value>
+      class BitField  : public Range<_IntT, 0, MaxBitsT<_IntT>::value>
                       , private base::SafeBool<BitField<_IntT> >
       {
         typedef typename base::SafeBool<BitField<_IntT> >::bool_type bool_type;

diff --git a/zypp/Digest.cc b/zypp/Digest.cc
index 415ae0102b3dfb0cbeadd57186c84cdd03a92fb5..99fbb774dc673f242db88cf466ab6ed138748ace 100644 (file)
--- a/zypp/Digest.cc
+++ b/zypp/Digest.cc
@@ -15,6 +15,7 @@
 #include <cstdio> // snprintf
 #include <openssl/evp.h>
 #include <string>
+#include <string.h>
 
 #include <iostream>
 

diff --git a/zypp/Edition.h b/zypp/Edition.h
index b37af0ec11e339b650fa53d67131edf5d9df8a78..90b75eea555262d8f9d1609db7d91f5cef13b6f0 100644 (file)
--- a/zypp/Edition.h
+++ b/zypp/Edition.h
@@ -137,7 +137,7 @@ namespace zypp
     /** \ref compare functor.
      * \see \ref RelCompare.
     */
-    typedef Compare<Edition> Compare;
+    typedef Compare<Edition> CompareEd;
 
     /** \ref Edition \ref Range based on \ref Compare.
      * \see \ref RelCompare.

diff --git a/zypp/base/Exception.h b/zypp/base/Exception.h
index 5ff692ffd6cadef20e0fd000cb1dc8f00835bff7..325c14e36e9e3214e70a60470d746a5f392eb662 100644 (file)
--- a/zypp/base/Exception.h
+++ b/zypp/base/Exception.h
@@ -16,6 +16,7 @@
 #include <iosfwd>
 #include <list>
 #include <stdexcept>
+#include <string.h>
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp

diff --git a/zypp/base/ExternalDataSource.cc b/zypp/base/ExternalDataSource.cc
index cd0ccfd04fe7c7ba72ba586b5631c5809f9e55df..fb02e1fbb9857c49dac0d4d1bb506f86f91acbc0 100644 (file)
--- a/zypp/base/ExternalDataSource.cc
+++ b/zypp/base/ExternalDataSource.cc
@@ -20,6 +20,8 @@
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <iostream>
+#include <stdlib.h>
+#include <string.h>
 
 #include <string>
 

diff --git a/zypp/base/Logger.h b/zypp/base/Logger.h
index 5e5298751a0dc7cdb55ecb8c1a3f04076bc7bcfd..75e4080513b97e6a86645e9e1220ce311bd2f23b 100644 (file)
--- a/zypp/base/Logger.h
+++ b/zypp/base/Logger.h
@@ -13,6 +13,7 @@
 #define ZYPP_BASE_LOGGER_H
 
 #include <iosfwd>
+#include <string.h>
 
 /** \defgroup ZYPP_BASE_LOGGER_MACROS ZYPP_BASE_LOGGER_MACROS
  *  Convenience macros for logging.

diff --git a/zypp/base/String.h b/zypp/base/String.h
index 56476fe52746f923dd849c4003f4bcea171d11b9..b2851adcd1526a05984caaf44fce7f89605d6ddf 100644 (file)
--- a/zypp/base/String.h
+++ b/zypp/base/String.h
@@ -14,6 +14,7 @@
 
 #include <iosfwd>
 #include <string>
+#include <string.h>
 
 #include "zypp/base/PtrTypes.h"
 

diff --git a/zypp/solver/detail/Pending.h b/zypp/solver/detail/Pending.h
index e9e487e8102c554d3a20259ade68985ec13e1b08..b2270611de70c9478dbc667ee99f961eda51a308 100644 (file)
--- a/zypp/solver/detail/Pending.h
+++ b/zypp/solver/detail/Pending.h
@@ -25,6 +25,7 @@
 #include <iosfwd>
 #include <list>
 #include <string>
+#include <string.h>
 
 #include "zypp/base/ReferenceCounted.h"
 #include "zypp/base/NonCopyable.h"