azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverting wrong changes

Browse Source
This commit is contained in:
pTalanov
2012-02-27 19:15:28 +04:00
parent 953c33a846
commit 3fc7e849de
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+2 -2
View File
@@ -173,8 +173,8 @@ public class AnnotationResolver {
List<AnnotationDescriptor> result = Lists.newArrayList();
for (JetAnnotationEntry annotation : annotations) {
AnnotationDescriptor annotationDescriptor = new AnnotationDescriptor();
// result.add(annotationDescriptor);
// trace.record(BindingContext.ANNOTATION, annotation, annotationDescriptor);
result.add(annotationDescriptor);
trace.record(BindingContext.ANNOTATION, annotation, annotationDescriptor);
}
return result;
}
compiler/frontend/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java
-5
View File
@@ -462,11 +462,6 @@ public class JetStandardLibrary {
return volatileType;
}
@NotNull
public Collection<ClassDescriptor> getArrayClasses() {
return primitiveTypeToArrayClass.values();
}
public final boolean isVolatile(PropertyDescriptor descriptor) {
List<AnnotationDescriptor> annotations = descriptor.getOriginal().getAnnotations();
if(annotations != null) {