Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to allow the code to compile with Swift 2.0 #232

Merged
merged 2 commits into from
Jul 22, 2015

Conversation

jmacmullin
Copy link

  • Failable initializers can’t override non-failable initializers
  • observeValueForKeyPath’s signature didn’t match the signature of the
    method it was overriding

- Failable initializers can’t override non-failable initializers
- observeValueForKeyPath’s signature didn’t match the signature of the
method it was overriding
@@ -828,8 +828,7 @@ public class ChartViewBase: UIView, ChartAnimatorDelegate
internal typealias VoidClosureType = () -> ()
internal var _sizeChangeEventActions = [VoidClosureType]()

override public func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [String: AnyObject]?, context: UnsafeMutablePointer<Void>)
{
public override func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [NSObject : AnyObject]?, context: UnsafeMutablePointer<Void>) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make sure to preserve code styling of the framework :)

(and I missed on failable initializer)
@jmacmullin
Copy link
Author

Oops, sorry about that :-)

danielgindi added a commit that referenced this pull request Jul 22, 2015
Fixes to allow the code to compile with Swift 2.0
@danielgindi danielgindi merged commit 0eaed5c into ChartsOrg:swift-2.0 Jul 22, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants