March 2014 update

2014-04-02 16:56:35 +00:00 · 2014-04-02 16:56:35 +00:00 · a25938f123
commit a25938f123
parent 09687c4926
1846 changed files with 21876 additions and 5203 deletions
--- a/Task/Inheritance-Multiple/Objective-C/inheritance-multiple.m
+++ b/Task/Inheritance-Multiple/Objective-C/inheritance-multiple.m
@ -28,12 +28,6 @@
  return self;
 }

-(void)dealloc {
-  [camera release];
-  [phone release];
-  [super dealloc];
-}
-
 -(void)forwardInvocation:(NSInvocation *)anInvocation {
  SEL aSelector = [anInvocation selector];
  if ([camera respondsToSelector:aSelector])
--- a/Task/Inheritance-Multiple/Scala/inheritance-multiple.scala
+++ b/Task/Inheritance-Multiple/Scala/inheritance-multiple.scala
@ -0,0 +1,3 @@
+trait Camera
+trait MobilePhone
+class CameraPhone extends Camera with MobilePhone