Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10645 - in /trunk/libzypp/zypp: CMakeLists.txt IdStringType.h ResTraits.h base/KindOf.h base/Logger.h data/ResolvableData.cc solver/detail/Resolver.h target/rpm/RpmHeader.h
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Tue, 22 Jul 2008 15:35:08 -0000
  • Message-id: <20080722153508.8C7F52A1E2@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Tue Jul 22 17:35:07 2008
New Revision: 10645

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10645&view=rev
Log:
- remove all remaining freshes occurances
- remove obsolete class KindOf<>

Removed:
trunk/libzypp/zypp/base/KindOf.h
Modified:
trunk/libzypp/zypp/CMakeLists.txt
trunk/libzypp/zypp/IdStringType.h
trunk/libzypp/zypp/ResTraits.h
trunk/libzypp/zypp/base/Logger.h
trunk/libzypp/zypp/data/ResolvableData.cc
trunk/libzypp/zypp/solver/detail/Resolver.h
trunk/libzypp/zypp/target/rpm/RpmHeader.h

Modified: trunk/libzypp/zypp/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=10645&r1=10644&r2=10645&view=diff
==============================================================================
--- trunk/libzypp/zypp/CMakeLists.txt (original)
+++ trunk/libzypp/zypp/CMakeLists.txt Tue Jul 22 17:35:07 2008
@@ -218,7 +218,6 @@
base/IOStream.h
base/InputStream.h
base/Iterator.h
- base/KindOf.h
base/LogControl.h
base/LogTools.h
base/Logger.h

Modified: trunk/libzypp/zypp/IdStringType.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/IdStringType.h?rev=10645&r1=10644&r2=10645&view=diff
==============================================================================
--- trunk/libzypp/zypp/IdStringType.h (original)
+++ trunk/libzypp/zypp/IdStringType.h Tue Jul 22 17:35:07 2008
@@ -108,9 +108,10 @@
IdString::IdType id() const { return idStr().id(); }

public:
+#ifndef SWIG // Swig treats it as syntax error
/** Evaluate in a boolean context <tt>( ! empty() )</tt>. */
using base::SafeBool<Derived>::operator bool_type;
-
+#endif
public:
static int compare( const Derived & lhs, const Derived & rhs ) {
return compare( lhs.idStr(), rhs.idStr() ); }
static int compare( const Derived & lhs, const IdString & rhs ) {
return compare( lhs.idStr(), rhs ); }
@@ -149,8 +150,9 @@
}

private:
-
+#ifndef SWIG // Swig treats it as syntax error
friend base::SafeBool<Derived>::operator bool_type() const;
+#endif
bool boolTest() const { return ! empty(); }
};
///////////////////////////////////////////////////////////////////

Modified: trunk/libzypp/zypp/ResTraits.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResTraits.h?rev=10645&r1=10644&r2=10645&view=diff
==============================================================================
--- trunk/libzypp/zypp/ResTraits.h (original)
+++ trunk/libzypp/zypp/ResTraits.h Tue Jul 22 17:35:07 2008
@@ -13,7 +13,6 @@
#define ZYPP_RESTRAITS_H

#include "zypp/base/PtrTypes.h"
-#include "zypp/base/KindOf.h"
#include "zypp/ResKind.h"

///////////////////////////////////////////////////////////////////

Modified: trunk/libzypp/zypp/base/Logger.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Logger.h?rev=10645&r1=10644&r2=10645&view=diff
==============================================================================
--- trunk/libzypp/zypp/base/Logger.h (original)
+++ trunk/libzypp/zypp/base/Logger.h Tue Jul 22 17:35:07 2008
@@ -52,7 +52,7 @@
#define USR _USR( ZYPP_BASE_LOGGER_LOGGROUP )

#define _XXX(GROUP) ZYPP_BASE_LOGGER_LOG( GROUP, zypp::base::logger::E_XXX )
-#define _DBG(GROUP) ZYPP_BASE_LOGGER_LOG( GROUP, zypp::base::logger::E_DBG )
+#define _DBG(GROUP) ZYPP_BASE_LOGGER_LOG( GROUP"++", zypp::base::logger::E_MIL
)
#define _MIL(GROUP) ZYPP_BASE_LOGGER_LOG( GROUP, zypp::base::logger::E_MIL )
#define _WAR(GROUP) ZYPP_BASE_LOGGER_LOG( GROUP, zypp::base::logger::E_WAR )
#define _ERR(GROUP) ZYPP_BASE_LOGGER_LOG( GROUP, zypp::base::logger::E_ERR )

Modified: trunk/libzypp/zypp/data/ResolvableData.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/data/ResolvableData.cc?rev=10645&r1=10644&r2=10645&view=diff
==============================================================================
--- trunk/libzypp/zypp/data/ResolvableData.cc (original)
+++ trunk/libzypp/zypp/data/ResolvableData.cc Tue Jul 22 17:35:07 2008
@@ -37,7 +37,6 @@
// << " provides: " << provides << endl
// << " conflicts: " << conflicts << endl
// << " obsoletes: " << obsoletes << endl
-// << " freshens: " << freshens << endl
// << " requires: " << requires << endl
// << " recommends:" << endl << recommends << endl
// << " suggests:" << endl << suggests << endl

Modified: trunk/libzypp/zypp/solver/detail/Resolver.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resolver.h?rev=10645&r1=10644&r2=10645&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/Resolver.h (original)
+++ trunk/libzypp/zypp/solver/detail/Resolver.h Tue Jul 22 17:35:07 2008
@@ -72,7 +72,7 @@
bool initialInstallation; //This item has triggered the installation
//Not already fullfilled requierement only.

- ItemCapKind() : capKind("FRESHENS") {}
+ ItemCapKind() : capKind(Dep::PROVIDES) {}
ItemCapKind( PoolItem i, Capability c, Dep k, bool initial)
: cap( c )
, capKind( k )

Modified: trunk/libzypp/zypp/target/rpm/RpmHeader.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmHeader.h?rev=10645&r1=10644&r2=10645&view=diff
==============================================================================
--- trunk/libzypp/zypp/target/rpm/RpmHeader.h (original)
+++ trunk/libzypp/zypp/target/rpm/RpmHeader.h Tue Jul 22 17:35:07 2008
@@ -130,11 +130,6 @@
**/
CapabilitySet tag_supplements( std::set<std::string> * freq_r = 0 ) const
{ return CapabilitySet(); }
- /** Unsupported by rpm.
- * @see #tag_provides
- **/
- CapabilitySet tag_freshens( std::set<std::string> * freq_r = 0 ) const
- { return CapabilitySet(); }

ByteCount tag_size() const;
ByteCount tag_archivesize() const;

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages