Addressing style issues in JSON parser.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146968 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/JSONParser.h b/include/llvm/Support/JSONParser.h
index e959f590a2d363be3c66396927a7af296f7a8807..816f9a948396316a4a38ef8fc69861efe42c2961 100644 (file)
--- a/include/llvm/Support/JSONParser.h
+++ b/include/llvm/Support/JSONParser.h
@@ -1,4 +1,4 @@
-//===--- JsonParser.h - Simple JSON parser ----------------------*- C++ -*-===//
+//===--- JSONParser.h - Simple JSON parser ----------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -17,15 +17,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_TOOLING_JSON_PARSER_H
-#define LLVM_CLANG_TOOLING_JSON_PARSER_H
+#ifndef LLVM_SUPPORT_JSON_PARSER_H
+#define LLVM_SUPPORT_JSON_PARSER_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/ErrorHandling.h"
 
-#include <string>
-
 namespace llvm {
 
 class JSONString;
@@ -441,4 +439,4 @@ StringRef::iterator JSONParser::parseNextElement(const AtomT *&Element) {
 
 } // end namespace llvm
 
-#endif // LLVM_CLANG_TOOLING_JSON_PARSER_H
+#endif // LLVM_SUPPORT_JSON_PARSER_H

diff --git a/lib/Support/JSONParser.cpp b/lib/Support/JSONParser.cpp
index 30c2afcdfc332e5cc6bd2d4c14edbbe482d747ba..36da12d3764593c27ae71784737365909cb0b06c 100644 (file)
--- a/lib/Support/JSONParser.cpp
+++ b/lib/Support/JSONParser.cpp
@@ -1,4 +1,4 @@
-//===--- JsonParser.cpp - Simple JSON parser ------------------------------===//
+//===--- JSONParser.cpp - Simple JSON parser ------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -16,7 +16,7 @@
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/Casting.h"
 
-namespace llvm {
+using namespace llvm;
 
 JSONParser::JSONParser(StringRef Input)
   : Input(Input), Position(Input.begin()) {}
@@ -217,5 +217,3 @@ template <> JSONValue *JSONParser::parseElement() {
 template <> JSONKeyValuePair *JSONParser::parseElement() {
   return parseKeyValuePair();
 }
-
-} // end namespace llvm