Permalink
Browse files

Additional header cleanup

Also replaces usage of stringstream with ostringstream where we only use
it for outputting data.
  • Loading branch information...
1 parent 2dc4bda commit a528c19b5d2c4634f82584fb50331214a925b303 @dbussink dbussink committed May 26, 2013
View
@@ -34,7 +34,6 @@
#include "dtrace/dtrace.h"
-#include <ostream>
#include <sstream>
#include <fstream>
@@ -239,7 +238,7 @@ namespace rubinius {
bert::IOWriter writer(client.socket);
bert::Encoder<bert::IOWriter> encoder(writer);
- std::stringstream name;
+ std::ostringstream name;
std::ifstream file;
bert::Value* val = 0;
@@ -602,7 +601,7 @@ namespace rubinius {
cl.begin_auth(incr_tmp_key());
- std::stringstream name;
+ std::ostringstream name;
name << "/tmp/agent-auth." << getuid() << "-" << getpid() << "." << cl.auth_key;
int file = open(name.str().c_str(), O_CREAT | O_WRONLY | O_EXCL, 0600);
View
@@ -1,5 +1,4 @@
#include "arguments.hpp"
-#include "builtin/array.hpp"
namespace rubinius {
void Arguments::append(STATE, Array* ary) {
@@ -5,7 +5,6 @@
#include "builtin/call_unit.hpp"
#include "builtin/exception.hpp"
#include "builtin/executable.hpp"
-#include "builtin/module.hpp"
#include "builtin/mono_inline_cache.hpp"
#include "builtin/object.hpp"
#include "builtin/poly_inline_cache.hpp"
@@ -1,7 +1,6 @@
#include "builtin/constant_cache.hpp"
#include "builtin/class.hpp"
#include "builtin/constantscope.hpp"
-#include "builtin/module.hpp"
#include "object_utils.hpp"
#include "ontology.hpp"
@@ -5,7 +5,6 @@
#include "builtin/array.hpp"
#include "builtin/class.hpp"
#include "builtin/exception.hpp"
-#include "builtin/module.hpp"
#include "builtin/object.hpp"
#include "builtin/symbol.hpp"
#include "builtin/tuple.hpp"
@@ -5,7 +5,6 @@
#include "builtin/array.hpp"
#include "builtin/bytearray.hpp"
#include "builtin/class.hpp"
-#include "builtin/module.hpp"
#include "builtin/object.hpp"
#include "builtin/string.hpp"
#include "builtin/symbol.hpp"
@@ -1,6 +1,5 @@
#include "arguments.hpp"
#include "builtin/class.hpp"
-#include "builtin/module.hpp"
#include "builtin/mono_inline_cache.hpp"
#include "builtin/poly_inline_cache.hpp"
#include "builtin/executable.hpp"
@@ -1,7 +1,6 @@
#include "arguments.hpp"
#include "builtin/class.hpp"
#include "builtin/executable.hpp"
-#include "builtin/module.hpp"
#include "builtin/mono_inline_cache.hpp"
#include "builtin/poly_inline_cache.hpp"
#include "builtin/symbol.hpp"
@@ -1,18 +1,13 @@
-#include "prelude.hpp"
-#include "oop.hpp"
-
-#include "bytecode_verification.hpp"
#include "builtin/compiledcode.hpp"
#include "builtin/iseq.hpp"
#include "builtin/tuple.hpp"
#include "builtin/fixnum.hpp"
#include "builtin/symbol.hpp"
-
+#include "bytecode_verification.hpp"
+#include "configuration.hpp"
+#include "instruments/timing.hpp"
#include "machine_code.hpp"
#include "object_utils.hpp"
-#include "instruments/timing.hpp"
-
-#include "configuration.hpp"
namespace rubinius {
BytecodeVerification::BytecodeVerification(CompiledCode* code)
View
@@ -1,19 +1,17 @@
-#include <iostream>
-
-#include "call_frame.hpp"
-#include "builtin/variable_scope.hpp"
#include "builtin/class.hpp"
-#include "builtin/module.hpp"
-#include "builtin/string.hpp"
-#include "builtin/symbol.hpp"
#include "builtin/compiledcode.hpp"
-#include "builtin/tuple.hpp"
#include "builtin/constantscope.hpp"
#include "builtin/lookuptable.hpp"
#include "builtin/nativemethod.hpp"
-
+#include "builtin/string.hpp"
+#include "builtin/symbol.hpp"
+#include "builtin/tuple.hpp"
+#include "builtin/variable_scope.hpp"
+#include "call_frame.hpp"
#include "object_utils.hpp"
+#include <iostream>
+
namespace rubinius {
Object* CallFrame::last_match(STATE) {
CallFrame* use = this->top_ruby_frame();;
View
@@ -6,16 +6,16 @@
* primary execution begins, when the VM loads the loader.rbc and executes
* it. */
-#include "compiled_file.hpp"
-#include "marshal.hpp"
#include "arguments.hpp"
-#include "call_frame.hpp"
-#include "objectmemory.hpp"
-#include "object_utils.hpp"
#include "builtin/constantscope.hpp"
#include "builtin/compiledcode.hpp"
#include "builtin/class.hpp"
#include "builtin/thread.hpp"
+#include "call_frame.hpp"
+#include "compiled_file.hpp"
+#include "marshal.hpp"
+#include "objectmemory.hpp"
+#include "object_utils.hpp"
namespace rubinius {
CompiledFile* CompiledFile::load(std::istream& stream) {
@@ -1,10 +1,11 @@
#ifndef RBX_COMPILED_FILE_HPP
#define RBX_COMPILED_FILE_HPP
-#include <string>
-
#include "prelude.hpp"
+#include <string>
+#include <istream>
+
namespace rubinius {
class Object;
@@ -1,9 +1,8 @@
#ifndef RBX_CONFIG_PARSER
#define RBX_CONFIG_PARSER
+#include <string>
#include <iostream>
-#include <sstream>
-#include <map>
#include <vector>
namespace rubinius {
View
@@ -1,15 +1,14 @@
-#include "dispatch.hpp"
#include "arguments.hpp"
-#include "lookup_data.hpp"
-#include "global_cache.hpp"
-
#include "builtin/module.hpp"
#include "builtin/class.hpp"
#include "builtin/symbol.hpp"
#include "builtin/executable.hpp"
#include "builtin/exception.hpp"
+#include "dispatch.hpp"
+#include "global_cache.hpp"
+#include "lookup_data.hpp"
-#include <iostream>
+#include <sstream>
namespace rubinius {
Object* Dispatch::send(STATE, CallFrame* call_frame, Arguments& args,
View
@@ -1,11 +1,12 @@
#ifndef RBX_DISPATCH_HPP
#define RBX_DISPATCH_HPP
-#include "builtin/object.hpp"
+#include "vm.hpp"
namespace rubinius {
class Symbol;
class Module;
+ class Object;
class Executable;
struct CallFrame;
class Arguments;

0 comments on commit a528c19

Please sign in to comment.