SERVER-10026 syntactic code fixes for Windows

- a struct is not a class
- "ERROR" is a macro on Windows :(

4 files changed, 5 insertions, 5 deletions

diff --git a/src/mongo/db/exec/index_scan.h b/src/mongo/db/exec/index_scan.h
index 2f53a1da53a..82512dca804 100644
--- a/src/mongo/db/exec/index_scan.h
+++ b/src/mongo/db/exec/index_scan.h
@@ -27,7 +27,7 @@ namespace mongo {
     class IndexAccessMethod;
     class IndexCursor;
     class IndexDescriptor;
-    class IndexScanParams;
+    struct IndexScanParams;
     class WorkingSet;
 
     /**
diff --git a/src/mongo/db/exec/plan_stage.h b/src/mongo/db/exec/plan_stage.h
index 8429e4fd79e..c1a232b3b2c 100644
--- a/src/mongo/db/exec/plan_stage.h
+++ b/src/mongo/db/exec/plan_stage.h
@@ -70,7 +70,7 @@ namespace mongo {
      *     case PlanStage::NEED_TIME:
      *         // Need more time.
      *         break;
-     *     case PlanStage::ERROR:
+     *     case PlanStage::FAILURE:
      *         // Throw exception or return error
      *         break;
      *     case PlanStage::NEED_FETCH:
@@ -101,7 +101,7 @@ namespace mongo {
             // work(...) needs more time to product a result.  Call work(...) again.
             NEED_TIME,
             // Something has gone unrecoverably wrong.  Stop running this query.
-            ERROR,
+            FAILURE,
             // Something isn't in memory.  Fetch it.  TODO: actually support this (forthcoming).
             NEED_YIELD,
         };
diff --git a/src/mongo/db/exec/simple_plan_runner.h b/src/mongo/db/exec/simple_plan_runner.h
index 490d9ba4996..34ca0b2f29a 100644
--- a/src/mongo/db/exec/simple_plan_runner.h
+++ b/src/mongo/db/exec/simple_plan_runner.h
@@ -60,7 +60,7 @@ namespace mongo {
                     // TODO: Occasionally yield.  For now, we run until we get another result.
                 }
                 else {
-                    // IS_EOF, ERROR, NEED_YIELD.  We just stop here.
+                    // IS_EOF, FAILURE, NEED_YIELD.  We just stop here.
                     return false;
                 }
             }
diff --git a/src/mongo/db/exec/working_set.h b/src/mongo/db/exec/working_set.h
index 6a324fb7e6e..f152871c029 100644
--- a/src/mongo/db/exec/working_set.h
+++ b/src/mongo/db/exec/working_set.h
@@ -23,7 +23,7 @@
 
 namespace mongo {
 
-    class WorkingSetMember;
+    struct WorkingSetMember;
 
     typedef long WorkingSetID;