[llvm-commits] [llvm] r146968 - in /llvm/trunk: include/llvm/Support/JSONParser.h lib/Support/JSONParser.cpp

[Manuel Klimek]

Author: klimek
Date: Tue Dec 20 03:26:26 2011
New Revision: 146968

URL: http://llvm.org/viewvc/llvm-project?rev=146968&view=rev
Log:
Addressing style issues in JSON parser.

Modified:
    llvm/trunk/include/llvm/Support/JSONParser.h
    llvm/trunk/lib/Support/JSONParser.cpp

Modified: llvm/trunk/include/llvm/Support/JSONParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/JSONParser.h?rev=146968&r1=146967&r2=146968&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/JSONParser.h (original)
+++ llvm/trunk/include/llvm/Support/JSONParser.h Tue Dec 20 03:26:26 2011
@@ -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 @@
 
 } // end namespace llvm
 
-#endif // LLVM_CLANG_TOOLING_JSON_PARSER_H
+#endif // LLVM_SUPPORT_JSON_PARSER_H

Modified: llvm/trunk/lib/Support/JSONParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/JSONParser.cpp?rev=146968&r1=146967&r2=146968&view=diff
==============================================================================
--- llvm/trunk/lib/Support/JSONParser.cpp (original)
+++ llvm/trunk/lib/Support/JSONParser.cpp Tue Dec 20 03:26:26 2011
@@ -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 <> JSONKeyValuePair *JSONParser::parseElement() {
   return parseKeyValuePair();
 }
-
-} // end namespace llvm