Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10650 - in /trunk/libzypp/zypp: CapMatch.h Repository.h
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Wed, 23 Jul 2008 12:22:18 -0000
  • Message-id: <20080723122218.9AB833418C@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Wed Jul 23 14:22:18 2008
New Revision: 10650

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10650&view=rev
Log:
swigfixes

Modified:
trunk/libzypp/zypp/CapMatch.h
trunk/libzypp/zypp/Repository.h

Modified: trunk/libzypp/zypp/CapMatch.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CapMatch.h?rev=10650&r1=10649&r2=10650&view=diff
==============================================================================
--- trunk/libzypp/zypp/CapMatch.h (original)
+++ trunk/libzypp/zypp/CapMatch.h Wed Jul 23 14:22:18 2008
@@ -40,6 +40,10 @@

public:

+ CapMatch()
+ : _result( IRRELEVANT )
+ {}
+
CapMatch( bool val_r )
: _result( val_r ? MATCH : NOMATCH )
{}
@@ -84,10 +88,6 @@
friend std::ostream & operator<<( std::ostream & str, const CapMatch & obj
);

private:
- CapMatch()
- : _result( IRRELEVANT )
- {}
-
Result _result;
};
///////////////////////////////////////////////////////////////////

Modified: trunk/libzypp/zypp/Repository.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Repository.h?rev=10650&r1=10649&r2=10650&view=diff
==============================================================================
--- trunk/libzypp/zypp/Repository.h (original)
+++ trunk/libzypp/zypp/Repository.h Wed Jul 23 14:22:18 2008
@@ -19,15 +19,16 @@
#include "zypp/sat/Solvable.h"
#include "zypp/RepoInfo.h"
#include "zypp/Date.h"
-extern "C"
-{
-#include "satsolver/repo.h"
-}

///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////

+ namespace detail
+ {
+ struct ByRepository;
+ }
+
///////////////////////////////////////////////////////////////////
//
// CLASS NAME : Repository
@@ -54,14 +55,15 @@
/** Represents no \ref Repository. */
static const Repository noRepository;

+#ifndef SWIG // Swig treats it as syntax error
/** Evaluate \ref Repository in a boolean context (\c != \c
noRepository). */
using base::SafeBool<Repository>::operator bool_type;
-
+#endif
/** Return whether this is the system repository. */
bool isSystemRepo() const;

public:
- /**
+ /**
* Short unique, convenience string to refer to a repo.
* ie: openSUSE-10.3
*
@@ -72,7 +74,7 @@
*/
std::string alias() const;

- /**
+ /**
* Short unique, convenience string to refer to a repo.
* ie: openSUSE-10.3
*
@@ -87,7 +89,7 @@
*/
ZYPP_DEPRECATED std::string name() const
{ return alias(); }
-
+
/**
* Timestamp when this repository was generated
*
@@ -99,7 +101,7 @@
* the resource specified in the xml file whith
* the newest timestamp attribute (which is the
* timestamp of the file in the server ).
- *
+ *
* The timestamp is 0 if the repository does not
* specify when it was generated.
*
@@ -195,7 +197,9 @@
/** Expert backdoor. */
IdType id() const { return _id; }
private:
+#ifndef SWIG // Swig treats it as syntax error
friend base::SafeBool<Repository>::operator bool_type() const;
+#endif
bool boolTest() const { return get(); }
private:
IdType _id;

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

< Previous Next >
This Thread
  • No further messages