Fixed compilation errors, and updated headers to include amalgamated …

…vector Migrated files into correct location
archgrove · Jul 17, 2011 · 726a5a2 · 726a5a2
1 parent 9772cee
commit 726a5a2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/CSQuestion.h b/CSQuestion.h
@@ -30,17 +30,6 @@
 #import "CSPostMigrationInfo.h"
 #import "CSObjectVector.h"
 
-enum CSQuestionSortOrder
-{
-    CSQuestionSortByActivity,
-    CSQuestionSortByVotes,
-    CSQuestionSortByCreation,
-    CSQuestionSortByFeatured,
-    CSQuestionSortByHot,
-    CSQuestionSortByWeek,
-    CSQuestionSortByMonth
-};
-
 @interface CSQuestion : CSPost {
     NSArray *tags;
     int answer_count;

diff --git a/CSQuestion.m b/CSQuestion.m
@@ -32,6 +32,8 @@ of this software and associated documentation files (the "Software"), to deal
 #import "CSComment.h"
 #import "CSTimelineEntry.h"
 
+#import "CSRequestParams.h"
+
 @implementation CSQuestion
 
 @synthesize tags;

diff --git a/CSRequestParams.h b/CSRequestParams.h
@@ -26,6 +26,16 @@
 
 #import <Foundation/Foundation.h>
 
+enum CSQuestionSortOrder
+{
+    CSQuestionSortByActivity,
+    CSQuestionSortByVotes,
+    CSQuestionSortByCreation,
+    CSQuestionSortByFeatured,
+    CSQuestionSortByHot,
+    CSQuestionSortByWeek,
+    CSQuestionSortByMonth
+};
 
 @interface CSRequestParams : NSObject<NSCoding> {
     NSString *rawURL;

diff --git a/CSRequestParams.m b/CSRequestParams.m
@@ -27,7 +27,6 @@ of this software and associated documentation files (the "Software"), to deal
 #import <objc/runtime.h>
 
 #import "CSQuestion.h"
-#import "CSRequestParams.h"
 
 @implementation CSRequestParams
 

diff --git a/CoreStack.h b/CoreStack.h
@@ -32,6 +32,7 @@
 #import "CSRequestToken.h"
 #import "CSRequestParams.h"
 #import "CSObjectVector.h"
+#import "CSAmalgamatedObjectVector.h"
 
 #import "CSSiteDescriptor.h"
 #import "CSPost.h"