From 771f2db94bcce30aaf7e3e65fb3dada4798fcd34 Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Mon, 11 May 2015 17:26:42 +0200
Subject: [PATCH] cleanup

---
 lib/Basics/StringBuffer.h                 | 2 +-
 lib/Basics/string-buffer.cpp              | 6 +++---
 lib/SimpleHttpClient/SimpleHttpResult.cpp | 2 +-
 lib/V8/v8-json.cpp                        | 1 -
 lib/V8/v8-json.ll                         | 1 -
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/Basics/StringBuffer.h b/lib/Basics/StringBuffer.h
index 9ddd764f67..9767f38028 100644
--- a/lib/Basics/StringBuffer.h
+++ b/lib/Basics/StringBuffer.h
@@ -88,7 +88,7 @@ namespace triagens {
 /// @brief initialises the string buffer
 ////////////////////////////////////////////////////////////////////////////////
 
-        StringBuffer (TRI_memory_zone_t* zone, const size_t initialSize) {
+        StringBuffer (TRI_memory_zone_t* zone, size_t initialSize) {
           TRI_InitSizedStringBuffer(&_buffer, zone, initialSize);
         }
 
diff --git a/lib/Basics/string-buffer.cpp b/lib/Basics/string-buffer.cpp
index adf4e127bd..9d156370ca 100644
--- a/lib/Basics/string-buffer.cpp
+++ b/lib/Basics/string-buffer.cpp
@@ -338,7 +338,7 @@ TRI_string_buffer_t* TRI_CreateSizedStringBuffer (TRI_memory_zone_t* zone,
 void TRI_InitStringBuffer (TRI_string_buffer_t * self, TRI_memory_zone_t* zone) {
   self->_memoryZone = zone;
   self->_buffer = nullptr;
-  self->_current = 0;
+  self->_current = nullptr;
   self->_len = 0;
 
   Reserve(self, 120);
@@ -354,8 +354,8 @@ void TRI_InitSizedStringBuffer (TRI_string_buffer_t * self,
                                 TRI_memory_zone_t* zone,
                                 const size_t length) {
   self->_memoryZone = zone;
-  self->_buffer = 0;
-  self->_current = 0;
+  self->_buffer = nullptr;
+  self->_current = nullptr;
   self->_len = 0;
 
   Reserve(self, length);
diff --git a/lib/SimpleHttpClient/SimpleHttpResult.cpp b/lib/SimpleHttpClient/SimpleHttpResult.cpp
index a031b97efc..f04f9afc3f 100644
--- a/lib/SimpleHttpClient/SimpleHttpResult.cpp
+++ b/lib/SimpleHttpClient/SimpleHttpResult.cpp
@@ -215,7 +215,7 @@ namespace triagens {
     }
 
     bool SimpleHttpResult::isJson () const {
-      auto find = _headerFields.find("content-type");
+      auto const& find = _headerFields.find("content-type");
 
       if (find == _headerFields.end()) {
         return false;
diff --git a/lib/V8/v8-json.cpp b/lib/V8/v8-json.cpp
index 592f251d54..309ebb5c1e 100644
--- a/lib/V8/v8-json.cpp
+++ b/lib/V8/v8-json.cpp
@@ -2177,7 +2177,6 @@ static v8::Handle<v8::Value> ParseObject (v8::Isolate* isolate,
 
     if (c == STRING_CONSTANT) {
       // utf-8 attribute name
-std::cout << "utf8 attribute name: " << std::string(yytext + 1, yyleng - 2) << "\n";
       size_t outLength;
       char* name = TRI_UnescapeUtf8StringZ(yyextra._memoryZone, yytext + 1, yyleng - 2, &outLength);
     
diff --git a/lib/V8/v8-json.ll b/lib/V8/v8-json.ll
index 0a5e26c538..4e5d7badb3 100644
--- a/lib/V8/v8-json.ll
+++ b/lib/V8/v8-json.ll
@@ -259,7 +259,6 @@ static v8::Handle<v8::Value> ParseObject (v8::Isolate* isolate,
 
     if (c == STRING_CONSTANT) {
       // utf-8 attribute name
-std::cout << "utf8 attribute name: " << std::string(yytext + 1, yyleng - 2) << "\n";
       size_t outLength;
       char* name = TRI_UnescapeUtf8StringZ(yyextra._memoryZone, yytext + 1, yyleng - 2, &outLength);