import 15.2.0 Octopus source

[ceph.git] / ceph / src / crush / CrushCompiler.cc

diff --git a/ceph/src/crush/CrushCompiler.cc b/ceph/src/crush/CrushCompiler.cc
index 52ad056381a105c730e886cb0b06f785e4311730..eafda63afa7535635d9f9cc7fba21546ea1849ed 100644 (file)
--- a/ceph/src/crush/CrushCompiler.cc
+++ b/ceph/src/crush/CrushCompiler.cc
@@ -1,3 +1,5 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
 
 #include "CrushCompiler.h"
 
@@ -12,6 +14,14 @@
 #include "common/errno.h"
 #include <boost/algorithm/string.hpp>
 
+using std::cout;
+using std::istream;
+using std::map;
+using std::ostream;
+using std::set;
+using std::string;
+using std::vector;
+
 // -------------
 
 static void print_type_name(ostream& out, int t, CrushWrapper &crush)
@@ -1248,8 +1258,8 @@ int CrushCompiler::compile(istream& in, const char *infn)
   crush_grammar crushg;
   const char *start = big.c_str();
   //tree_parse_info<const char *> info = ast_parse(start, crushg, space_p);
-  tree_parse_info<> info = ast_parse(start, crushg, space_p);
-  
+  auto info = ast_parse(start, crushg, boost::spirit::space_p);
+
   // parse error?
   if (!info.full) {
     int cpos = info.stop - start;