Fix _H<> copy assignment operator.

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 496d8b21edca6c47e30048701e4533c23e23a8fc..03f0b95b2ab3acbf66a8c35a4a68797aa9963e58 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -324,7 +324,7 @@ float CYScrollViewDecelerationRateNormal;
         return;
 
     if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) {
         return;
 
     if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) {

-        request_ = (id) stage2_;
+        request_ = stage2_;

         stage1_ = nil;
         stage2_ = nil;
         return;
         stage1_ = nil;
         stage2_ = nil;
         return;


@@ -414,7 +414,7 @@ float CYScrollViewDecelerationRateNormal;
     if ([frame parentFrame] == nil)
         if (decision == CYWebPolicyDecisionUse)
             if (!error_) {
     if ([frame parentFrame] == nil)
         if (decision == CYWebPolicyDecisionUse)
             if (!error_) {

-                stage1_ = (id) request_;
+                stage1_ = request_;

                 request_ = request;
             }
 }
                 request_ = request;
             }
 }


@@ -525,7 +525,7 @@ float CYScrollViewDecelerationRateNormal;
         style_ = nil;
         function_ = nil;
 
         style_ = nil;
         function_ = nil;
 

-        stage2_ = (id) stage1_;
+        stage2_ = stage1_;

         stage1_ = nil;
 
         [self setHidesNavigationBar:NO];
         stage1_ = nil;
 
         [self setHidesNavigationBar:NO];

diff --git a/Menes/ObjectHandle.h b/Menes/ObjectHandle.h
index fa446a5173c9e08bbaae95bdac906799fbfe4cc9..716e6f44615d2aa7ac92215339ac953ec73fb1d1 100644 (file)
--- a/Menes/ObjectHandle.h
+++ b/Menes/ObjectHandle.h
@@ -85,6 +85,10 @@ class MenesObjectHandle {
                 CFRelease((CFTypeRef) old);
         } return *this;
     }
                 CFRelease((CFTypeRef) old);
         } return *this;
     }

+
+    _finline MenesObjectHandle &operator =(const MenesObjectHandle &value) {
+        return this->operator =(value.operator Type_ *());
+    }

 };
 
 #define _H MenesObjectHandle
 };
 
 #define _H MenesObjectHandle

diff --git a/MobileCydia.mm b/MobileCydia.mm
index ace39b4b6118f0244872079609cabf1399908f80..92bce95c33f2c9c48050b472ab7fd19e67d4e7f8 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -1462,8 +1462,7 @@ static void PackageImport(const void *key, const void *value, void *context) {
         host_ = [host_ lowercaseString];
 
     if (host_ != nil)
         host_ = [host_ lowercaseString];
 
     if (host_ != nil)

-        // XXX: this is due to a bug in _H<>
-        authority_ = (id) host_;
+        authority_ = host_;

     else
         authority_ = [url path];
 }
     else
         authority_ = [url path];
 }