Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > e14f0aabd7f6cb871cd2e8ea938c7bab > files > 3

teal-1_40b-4.fc13.src.rpm

diff -up teal-1_40b/teal_reg.h.fix teal-1_40b/teal_reg.h
--- teal-1_40b/teal_reg.h.fix	2010-07-01 17:57:28.068490213 +0530
+++ teal-1_40b/teal_reg.h	2010-07-01 17:59:13.907486022 +0530
@@ -110,8 +110,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SU
     char to_int (uint32 b) const;    //extract one bit (WARNING: Drops X/Z, see operator(uint32))
 
     //logic
-    friend four_state triple_equal (const reg& lhs, const reg& rhs);
-    friend bool operator== (const reg& lhs, const reg& rhs);
+    friend four_state ::teal::triple_equal (const reg& lhs, const reg& rhs);
+    friend bool ::teal::operator== (const reg& lhs, const reg& rhs);
     friend four_state operator< (const reg& lhs, const reg& rhs); //Should be bool?
     friend four_state reduce_xor (const reg&);
 
@@ -284,3 +284,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SU
     friend vout& operator<< (vout&, const vreg&);
   };
   vout& operator<< (vout&, const vreg&);
+
+reg::four_state triple_equal (const reg& lhs, const reg& rhs);
+bool operator== (const reg& lhs, const reg& rhs);
+reg::four_state operator< (const reg& lhs, const reg& rhs); //Should be bool?
diff -up teal-1_40b/teal_vreg.cpp.fix teal-1_40b/teal_vreg.cpp
--- teal-1_40b/teal_vreg.cpp.fix	2010-07-01 17:57:36.605361564 +0530
+++ teal-1_40b/teal_vreg.cpp	2010-07-01 18:00:05.499361284 +0530
@@ -143,7 +143,7 @@ void teal::vreg::connect_ () {
 
 #if defined (vpi_2_0)
   if (! handle_) {
-    local_log << teal_error << "Unable to get handle for \"" << path_and_name_ << "\" size:" << path_and_name_.size () << endm;
+    local_log << teal_error << "Unable to get handle for \"" << path_and_name_ << "\" size:" << (int)path_and_name_.size () << endm;
     vpi_control (vpiFinish);
   }