Merge pull request #1213 from pervazea/make_check

Minimal fix for "make check", #1196

Author: pervazea

src/include/optimizer/optimizer.h

@@ -37,6 +37,11 @@ namespace concurrency {
 class TransactionContext;
 }
 
+namespace test {
+  class OptimizerRuleTests_SimpleAssociativeRuleTest_Test;
+  class OptimizerRuleTests_SimpleAssociativeRuleTest2_Test;
+} 
+
 namespace optimizer {
 
 struct QueryInfo {
@@ -55,6 +60,9 @@ class Optimizer : public AbstractOptimizer {
   friend class BindingIterator;
   friend class GroupBindingIterator;
 
+  friend class ::peloton::test::OptimizerRuleTests_SimpleAssociativeRuleTest_Test;
+  friend class ::peloton::test::OptimizerRuleTests_SimpleAssociativeRuleTest2_Test; 
+
  public:
   Optimizer(const Optimizer &) = delete;
   Optimizer &operator=(const Optimizer &) = delete;

test/optimizer/optimizer_rule_test.cpp

@@ -10,8 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define private public
-
 #include "binder/bind_node_visitor.h"
 #include "catalog/catalog.h"
 #include "common/harness.h"