From: Duncan Mac-Vicar P <dmacvicar@suse.de>
Date: Mon, 14 Apr 2008 20:45:38 +0000 (+0000)
Subject: - fix compilation
X-Git-Tag: BASE-SuSE-Linux-11_0-Branch~245
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a32df140f0ddb81202ee8bbe1e1be23cfe8ebf5c;p=platform%2Fupstream%2Flibzypp.git

- fix compilation
- classes in namespace solver/detail but in sat dir?
- cmp functions not implemented (and purte virtual) -> comment
---

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 34203ef..77d1e8b 100644
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -489,6 +489,12 @@ SET( zypp_solver_detail_SRCS
   solver/detail/Resolver_problems.cc
   solver/detail/SolutionAction.cc
   solver/detail/Testcase.cc
+  solver/detail/SolverQueueItem.cc
+  solver/detail/SolverQueueItemInstall.cc
+  solver/detail/SolverQueueItemDelete.cc
+  solver/detail/SolverQueueItemUpdate.cc
+  solver/detail/SolverQueueItemInstallOneOf.cc
+
 )
 
 SET( zypp_solver_detail_HEADERS
@@ -521,11 +527,6 @@ SET( zypp_sat_SRCS
   sat/LookupAttr.cc
   sat/SATResolver.cc
   sat/SolvAttr.cc
-  sat/SolverQueueItem.cc
-  sat/SolverQueueItemInstall.cc
-  sat/SolverQueueItemDelete.cc
-  sat/SolverQueueItemUpdate.cc
-  sat/SolverQueueItemInstallOneOf.cc
 )
 
 SET( zypp_sat_HEADERS
diff --git a/zypp/sat/SolverQueueItem.cc b/zypp/solver/detail/SolverQueueItem.cc
similarity index 98%
rename from zypp/sat/SolverQueueItem.cc
rename to zypp/solver/detail/SolverQueueItem.cc
index 338eed3..68396c8 100644
--- a/zypp/sat/SolverQueueItem.cc
+++ b/zypp/solver/detail/SolverQueueItem.cc
@@ -19,7 +19,7 @@
  */
 
 #include "zypp/base/Logger.h"
-#include "zypp/sat/SolverQueueItem.h"
+#include "zypp/solver/detail/SolverQueueItem.h"
 
 
 /////////////////////////////////////////////////////////////////////////
diff --git a/zypp/sat/SolverQueueItem.h b/zypp/solver/detail/SolverQueueItem.h
similarity index 98%
rename from zypp/sat/SolverQueueItem.h
rename to zypp/solver/detail/SolverQueueItem.h
index 2f9ee4c..bfa5f08 100644
--- a/zypp/sat/SolverQueueItem.h
+++ b/zypp/solver/detail/SolverQueueItem.h
@@ -96,7 +96,7 @@ class SolverQueueItem : public base::ReferenceCounted, private base::NonCopyable
 
 
     virtual SolverQueueItem_Ptr copy (void) const = 0;
-    virtual int cmp (SolverQueueItem_constPtr item) const = 0;
+    //virtual int cmp (SolverQueueItem_constPtr item) const = 0;
     int compare (SolverQueueItem_constPtr item) const { return CMP(_type, item->_type); }
 
 
diff --git a/zypp/sat/SolverQueueItemDelete.cc b/zypp/solver/detail/SolverQueueItemDelete.cc
similarity index 98%
rename from zypp/sat/SolverQueueItemDelete.cc
rename to zypp/solver/detail/SolverQueueItemDelete.cc
index 61674e4..1f5c5eb 100644
--- a/zypp/sat/SolverQueueItemDelete.cc
+++ b/zypp/solver/detail/SolverQueueItemDelete.cc
@@ -19,7 +19,7 @@
  */
 
 #include "zypp/base/Logger.h"
-#include "zypp/sat/SolverQueueItemDelete.h"
+#include "zypp/solver/detail/SolverQueueItemDelete.h"
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp 
diff --git a/zypp/sat/SolverQueueItemDelete.h b/zypp/solver/detail/SolverQueueItemDelete.h
similarity index 96%
rename from zypp/sat/SolverQueueItemDelete.h
rename to zypp/solver/detail/SolverQueueItemDelete.h
index 5ae629d..7580a9b 100644
--- a/zypp/sat/SolverQueueItemDelete.h
+++ b/zypp/solver/detail/SolverQueueItemDelete.h
@@ -1,3 +1,4 @@
+
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /* QueueItem.h
  *
@@ -24,7 +25,7 @@
 #include <iosfwd>
 #include <string>
 
-#include "zypp/sat/SolverQueueItem.h"
+#include "zypp/solver/detail/SolverQueueItem.h"
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp
@@ -69,7 +70,7 @@ class SolverQueueItemDelete : public SolverQueueItem {
     // ---------------------------------- methods
 
     virtual SolverQueueItem_Ptr copy (void) const;
-    virtual int cmp (SolverQueueItem_constPtr item) const;
+    //virtual int cmp (SolverQueueItem_constPtr item) const;
 };
 
 ///////////////////////////////////////////////////////////////////
diff --git a/zypp/sat/SolverQueueItemInstall.cc b/zypp/solver/detail/SolverQueueItemInstall.cc
similarity index 98%
rename from zypp/sat/SolverQueueItemInstall.cc
rename to zypp/solver/detail/SolverQueueItemInstall.cc
index b54e5bb..a129def 100644
--- a/zypp/sat/SolverQueueItemInstall.cc
+++ b/zypp/solver/detail/SolverQueueItemInstall.cc
@@ -19,7 +19,7 @@
  */
 
 #include "zypp/base/Logger.h"
-#include "zypp/sat/SolverQueueItemInstall.h"
+#include "zypp/solver/detail/SolverQueueItemInstall.h"
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp 
diff --git a/zypp/sat/SolverQueueItemInstall.h b/zypp/solver/detail/SolverQueueItemInstall.h
similarity index 96%
rename from zypp/sat/SolverQueueItemInstall.h
rename to zypp/solver/detail/SolverQueueItemInstall.h
index 1a954de..44ee3cd 100644
--- a/zypp/sat/SolverQueueItemInstall.h
+++ b/zypp/solver/detail/SolverQueueItemInstall.h
@@ -24,7 +24,7 @@
 #include <iosfwd>
 #include <string>
 
-#include "zypp/sat/SolverQueueItem.h"
+#include "zypp/solver/detail/SolverQueueItem.h"
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp
@@ -69,7 +69,7 @@ class SolverQueueItemInstall : public SolverQueueItem {
     // ---------------------------------- methods
 
     virtual SolverQueueItem_Ptr copy (void) const;
-    virtual int cmp (SolverQueueItem_constPtr item) const;
+    //virtual int cmp (SolverQueueItem_constPtr item) const;
 };
 
 ///////////////////////////////////////////////////////////////////
diff --git a/zypp/sat/SolverQueueItemInstallOneOf.cc b/zypp/solver/detail/SolverQueueItemInstallOneOf.cc
similarity index 98%
rename from zypp/sat/SolverQueueItemInstallOneOf.cc
rename to zypp/solver/detail/SolverQueueItemInstallOneOf.cc
index 58a3de1..df29fb1 100644
--- a/zypp/sat/SolverQueueItemInstallOneOf.cc
+++ b/zypp/solver/detail/SolverQueueItemInstallOneOf.cc
@@ -19,7 +19,7 @@
  */
 
 #include "zypp/base/Logger.h"
-#include "zypp/sat/SolverQueueItemInstallOneOf.h"
+#include "zypp/solver/detail/SolverQueueItemInstallOneOf.h"
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp 
diff --git a/zypp/sat/SolverQueueItemInstallOneOf.h b/zypp/solver/detail/SolverQueueItemInstallOneOf.h
similarity index 96%
rename from zypp/sat/SolverQueueItemInstallOneOf.h
rename to zypp/solver/detail/SolverQueueItemInstallOneOf.h
index 1d428b2..78f806b 100644
--- a/zypp/sat/SolverQueueItemInstallOneOf.h
+++ b/zypp/solver/detail/SolverQueueItemInstallOneOf.h
@@ -24,7 +24,7 @@
 #include <iosfwd>
 #include <string>
 
-#include "zypp/sat/SolverQueueItem.h"
+#include "zypp/solver/detail/SolverQueueItem.h"
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp
@@ -72,7 +72,7 @@ class SolverQueueItemInstallOneOf : public SolverQueueItem {
     // ---------------------------------- methods
 
     virtual SolverQueueItem_Ptr copy (void) const;
-    virtual int cmp (SolverQueueItem_constPtr item) const;
+    //virtual int cmp (SolverQueueItem_constPtr item) const;
 };
 
 ///////////////////////////////////////////////////////////////////
diff --git a/zypp/sat/SolverQueueItemUpdate.cc b/zypp/solver/detail/SolverQueueItemUpdate.cc
similarity index 98%
rename from zypp/sat/SolverQueueItemUpdate.cc
rename to zypp/solver/detail/SolverQueueItemUpdate.cc
index 750938c..5656e74 100644
--- a/zypp/sat/SolverQueueItemUpdate.cc
+++ b/zypp/solver/detail/SolverQueueItemUpdate.cc
@@ -19,7 +19,7 @@
  */
 
 #include "zypp/base/Logger.h"
-#include "zypp/sat/SolverQueueItemUpdate.h"
+#include "zypp/solver/detail/SolverQueueItemUpdate.h"
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp 
diff --git a/zypp/sat/SolverQueueItemUpdate.h b/zypp/solver/detail/SolverQueueItemUpdate.h
similarity index 96%
rename from zypp/sat/SolverQueueItemUpdate.h
rename to zypp/solver/detail/SolverQueueItemUpdate.h
index 8f41da2..1fd3ce5 100644
--- a/zypp/sat/SolverQueueItemUpdate.h
+++ b/zypp/solver/detail/SolverQueueItemUpdate.h
@@ -24,7 +24,7 @@
 #include <iosfwd>
 #include <string>
 
-#include "zypp/sat/SolverQueueItem.h"
+#include "zypp/solver/detail/SolverQueueItem.h"
 #include "zypp/PoolItem.h"
 
 /////////////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@ class SolverQueueItemUpdate : public SolverQueueItem {
     // ---------------------------------- methods
 
     virtual SolverQueueItem_Ptr copy (void) const;
-    virtual int cmp (SolverQueueItem_constPtr item) const;
+    //virtual int cmp (SolverQueueItem_constPtr item) const;
 };
 
 ///////////////////////////////////////////////////////////////////