commit 61cf511980ce9154140e098ffb4f9bf3aa2ea9c9
author zuyu@cs.wisc.edu <zzhang@pivotal.io> Mon Apr 04 00:22:58 2016 -0700
committer zuyu@cs.wisc.edu <zzhang@pivotal.io> Mon Apr 04 00:43:52 2016 -0700
tree dc3cfa112c43c757849b225355fe0ca60431a4a6
parent 889d7e8835b927d179e26b93469a30f281b9a940

Fixing build issues in GCC.

query_execution/ShiftbossDirectory.hpp

diff --git a/query_execution/ShiftbossDirectory.hpp b/query_execution/ShiftbossDirectory.hpp
index ec0f8bf..9630089 100644
--- a/query_execution/ShiftbossDirectory.hpp
+++ b/query_execution/ShiftbossDirectory.hpp
@@ -154,7 +154,7 @@
    **/
   void decrementNumQueuedWorkOrders(const std::size_t shiftboss_index) {
     DCHECK_LT(shiftboss_index, size());
-    DCHECK_GE(num_queued_work_orders_[shiftboss_index], 1);
+    DCHECK_GE(num_queued_work_orders_[shiftboss_index], 1u);
     --num_queued_work_orders_[shiftboss_index];
   }
 

query_execution/WorkOrderProtosContainer.hpp

diff --git a/query_execution/WorkOrderProtosContainer.hpp b/query_execution/WorkOrderProtosContainer.hpp
index 473bc3d..be73a3a 100644
--- a/query_execution/WorkOrderProtosContainer.hpp
+++ b/query_execution/WorkOrderProtosContainer.hpp
@@ -48,9 +48,9 @@
    * @param num_operators Number of operators in the query DAG.
    **/
   explicit WorkOrderProtosContainer(const std::size_t num_operators)
-      : num_operators_(num_operators) {
-    DCHECK_NE(num_operators_, 0);
-    operator_containers_.resize(num_operators_);
+      : num_operators_(num_operators),
+        operator_containers_(num_operators_) {
+    DCHECK_NE(num_operators_, 0u);
   }
 
   /**
@@ -112,7 +112,7 @@
    **/
   void addWorkOrderProto(serialization::WorkOrder *proto,
                          const std::size_t operator_index) {
-    DCHECK_NOTNULL(proto);
+    DCHECK(proto != nullptr);
     DCHECK_LT(operator_index, num_operators_);
 
     operator_containers_[operator_index].emplace(proto);