You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2013/01/04 19:34:37 UTC
git commit: THRIFT-1815 Code generators line buffer output Patch:
Andrew Gaul
Updated Branches:
refs/heads/master 47a6e4708 -> 945537c1f
THRIFT-1815 Code generators line buffer output
Patch: Andrew Gaul
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/945537c1
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/945537c1
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/945537c1
Branch: refs/heads/master
Commit: 945537c1fc88ae27ac8231d423927fb7b40d10a6
Parents: 47a6e47
Author: Jens Geyer <je...@apache.org>
Authored: Fri Jan 4 19:33:29 2013 +0100
Committer: Jens Geyer <je...@apache.org>
Committed: Fri Jan 4 19:33:29 2013 +0100
----------------------------------------------------------------------
compiler/cpp/src/generate/t_as3_generator.cc | 9 ++++++++-
compiler/cpp/src/generate/t_c_glib_generator.cc | 9 ++++++++-
compiler/cpp/src/generate/t_cocoa_generator.cc | 9 ++++++++-
compiler/cpp/src/generate/t_cpp_generator.cc | 8 +++++++-
compiler/cpp/src/generate/t_csharp_generator.cc | 9 ++++++++-
compiler/cpp/src/generate/t_d_generator.cc | 10 +++++++++-
compiler/cpp/src/generate/t_delphi_generator.cc | 11 +++++++++--
compiler/cpp/src/generate/t_erl_generator.cc | 11 +++++++++--
compiler/cpp/src/generate/t_go_generator.cc | 10 ++++++++--
compiler/cpp/src/generate/t_hs_generator.cc | 9 ++++++++-
compiler/cpp/src/generate/t_html_generator.cc | 10 +++++++++-
compiler/cpp/src/generate/t_java_generator.cc | 9 ++++++++-
compiler/cpp/src/generate/t_javame_generator.cc | 9 ++++++++-
compiler/cpp/src/generate/t_js_generator.cc | 9 ++++++++-
compiler/cpp/src/generate/t_ocaml_generator.cc | 11 +++++++++--
compiler/cpp/src/generate/t_perl_generator.cc | 10 ++++++++--
compiler/cpp/src/generate/t_php_generator.cc | 10 +++++++++-
compiler/cpp/src/generate/t_py_generator.cc | 10 ++++++++--
compiler/cpp/src/generate/t_rb_generator.cc | 9 ++++++++-
compiler/cpp/src/generate/t_st_generator.cc | 10 ++++++++--
compiler/cpp/src/generate/t_xsd_generator.cc | 10 +++++++++-
21 files changed, 174 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_as3_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_as3_generator.cc b/compiler/cpp/src/generate/t_as3_generator.cc
index 05514f1..9f72eac 100644
--- a/compiler/cpp/src/generate/t_as3_generator.cc
+++ b/compiler/cpp/src/generate/t_as3_generator.cc
@@ -29,8 +29,15 @@
#include "platform.h"
#include "t_oop_generator.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* AS3 code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_c_glib_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_c_glib_generator.cc b/compiler/cpp/src/generate/t_c_glib_generator.cc
index bdee1bf..8012770 100644
--- a/compiler/cpp/src/generate/t_c_glib_generator.cc
+++ b/compiler/cpp/src/generate/t_c_glib_generator.cc
@@ -31,7 +31,14 @@
#include "platform.h"
#include "t_oop_generator.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/* forward declarations */
string initial_caps_to_underscores(string name);
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_cocoa_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_cocoa_generator.cc b/compiler/cpp/src/generate/t_cocoa_generator.cc
index 3a7e2c1..c4265f7 100644
--- a/compiler/cpp/src/generate/t_cocoa_generator.cc
+++ b/compiler/cpp/src/generate/t_cocoa_generator.cc
@@ -27,8 +27,15 @@
#include <sstream>
#include "t_oop_generator.h"
#include "platform.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* Objective-C code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_cpp_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
index a495741..d75b7de 100644
--- a/compiler/cpp/src/generate/t_cpp_generator.cc
+++ b/compiler/cpp/src/generate/t_cpp_generator.cc
@@ -33,8 +33,14 @@
#include "platform.h"
#include "t_oop_generator.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostream;
+using std::string;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* C++ code generator. This is legitimacy incarnate.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_csharp_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_csharp_generator.cc b/compiler/cpp/src/generate/t_csharp_generator.cc
index 31e4d0b..6dc8605 100644
--- a/compiler/cpp/src/generate/t_csharp_generator.cc
+++ b/compiler/cpp/src/generate/t_csharp_generator.cc
@@ -32,8 +32,15 @@
#include "platform.h"
#include "t_oop_generator.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
class t_csharp_generator : public t_oop_generator
{
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_d_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_d_generator.cc b/compiler/cpp/src/generate/t_d_generator.cc
index db5e17f..58dbb9a 100644
--- a/compiler/cpp/src/generate/t_d_generator.cc
+++ b/compiler/cpp/src/generate/t_d_generator.cc
@@ -34,8 +34,16 @@
#include "platform.h"
#include "t_oop_generator.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostream;
+using std::ostringstream;
+using std::set;
+using std::string;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* D code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_delphi_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_delphi_generator.cc b/compiler/cpp/src/generate/t_delphi_generator.cc
index c7a1107..6010a7d 100644
--- a/compiler/cpp/src/generate/t_delphi_generator.cc
+++ b/compiler/cpp/src/generate/t_delphi_generator.cc
@@ -35,8 +35,15 @@
#include "platform.h"
#include "t_oop_generator.h"
-using namespace std;
-
+using std::map;
+using std::ofstream;
+using std::ostream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
class t_delphi_generator : public t_oop_generator
{
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_erl_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_erl_generator.cc b/compiler/cpp/src/generate/t_erl_generator.cc
index 324b1da..ae1a122 100644
--- a/compiler/cpp/src/generate/t_erl_generator.cc
+++ b/compiler/cpp/src/generate/t_erl_generator.cc
@@ -30,8 +30,15 @@
#include "platform.h"
#include "version.h"
-using namespace std;
-
+using std::map;
+using std::ofstream;
+using std::ostream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const std::string endl = "\n"; // avoid ostream << std::endl flushes
/**
* Erlang code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_go_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc
index cb54ba6..0b9f16e 100644
--- a/compiler/cpp/src/generate/t_go_generator.cc
+++ b/compiler/cpp/src/generate/t_go_generator.cc
@@ -31,8 +31,14 @@
#include "platform.h"
#include "version.h"
-using namespace std;
-
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* Go code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_hs_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_hs_generator.cc b/compiler/cpp/src/generate/t_hs_generator.cc
index f275261..bbfaba5 100644
--- a/compiler/cpp/src/generate/t_hs_generator.cc
+++ b/compiler/cpp/src/generate/t_hs_generator.cc
@@ -31,7 +31,14 @@
#include "platform.h"
#include "version.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* Haskell code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_html_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_html_generator.cc b/compiler/cpp/src/generate/t_html_generator.cc
index 6838706..fb319ac 100644
--- a/compiler/cpp/src/generate/t_html_generator.cc
+++ b/compiler/cpp/src/generate/t_html_generator.cc
@@ -29,8 +29,16 @@
#include "t_generator.h"
#include "t_html_generator.h"
#include "platform.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::pair;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
enum input_type { INPUT_UNKNOWN, INPUT_UTF8, INPUT_PLAIN };
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_java_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc
index aa7f843..2f31a37 100644
--- a/compiler/cpp/src/generate/t_java_generator.cc
+++ b/compiler/cpp/src/generate/t_java_generator.cc
@@ -29,8 +29,15 @@
#include "platform.h"
#include "t_oop_generator.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* Java code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_javame_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_javame_generator.cc b/compiler/cpp/src/generate/t_javame_generator.cc
index 00503e1..aa847ac 100644
--- a/compiler/cpp/src/generate/t_javame_generator.cc
+++ b/compiler/cpp/src/generate/t_javame_generator.cc
@@ -29,8 +29,15 @@
#include "platform.h"
#include "t_oop_generator.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* Java code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_js_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_js_generator.cc b/compiler/cpp/src/generate/t_js_generator.cc
index 2776cd4..bff6423 100644
--- a/compiler/cpp/src/generate/t_js_generator.cc
+++ b/compiler/cpp/src/generate/t_js_generator.cc
@@ -17,6 +17,7 @@
* under the License.
*/
+#include <map>
#include <string>
#include <fstream>
#include <iostream>
@@ -29,8 +30,14 @@
#include "platform.h"
#include "version.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+static const string endl = "\n"; // avoid ostream << std::endl flushes
#include "t_oop_generator.h"
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_ocaml_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_ocaml_generator.cc b/compiler/cpp/src/generate/t_ocaml_generator.cc
index 39ddb82..8ee870f 100644
--- a/compiler/cpp/src/generate/t_ocaml_generator.cc
+++ b/compiler/cpp/src/generate/t_ocaml_generator.cc
@@ -30,8 +30,15 @@
#include "platform.h"
#include "version.h"
-using namespace std;
-
+using std::ios;
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* OCaml code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_perl_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_perl_generator.cc b/compiler/cpp/src/generate/t_perl_generator.cc
index 7fdad33..a40f85b 100644
--- a/compiler/cpp/src/generate/t_perl_generator.cc
+++ b/compiler/cpp/src/generate/t_perl_generator.cc
@@ -30,8 +30,14 @@
#include "platform.h"
#include "version.h"
-using namespace std;
-
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* PERL code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_php_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_php_generator.cc b/compiler/cpp/src/generate/t_php_generator.cc
index d728fbf..ef8185d 100644
--- a/compiler/cpp/src/generate/t_php_generator.cc
+++ b/compiler/cpp/src/generate/t_php_generator.cc
@@ -27,7 +27,15 @@
#include <sstream>
#include "t_oop_generator.h"
#include "platform.h"
-using namespace std;
+
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
#define NSGLOBAL (nsglobal_.size() ? nsglobal_ : "")
#define NSGLOBAL_A ("\\" + NSGLOBAL )
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_py_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_py_generator.cc b/compiler/cpp/src/generate/t_py_generator.cc
index 48e104f..8f79c37 100644
--- a/compiler/cpp/src/generate/t_py_generator.cc
+++ b/compiler/cpp/src/generate/t_py_generator.cc
@@ -31,8 +31,14 @@
#include "platform.h"
#include "version.h"
-using namespace std;
-
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* Python code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_rb_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_rb_generator.cc b/compiler/cpp/src/generate/t_rb_generator.cc
index 9471860..082f316 100644
--- a/compiler/cpp/src/generate/t_rb_generator.cc
+++ b/compiler/cpp/src/generate/t_rb_generator.cc
@@ -36,7 +36,14 @@
#include "platform.h"
#include "version.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* A subclass of std::ofstream that includes indenting functionality.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_st_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_st_generator.cc b/compiler/cpp/src/generate/t_st_generator.cc
index 18e8a3b..32ffd88 100644
--- a/compiler/cpp/src/generate/t_st_generator.cc
+++ b/compiler/cpp/src/generate/t_st_generator.cc
@@ -36,8 +36,14 @@
#include "t_oop_generator.h"
#include "version.h"
-using namespace std;
-
+using std::map;
+using std::ofstream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* Smalltalk code generator.
http://git-wip-us.apache.org/repos/asf/thrift/blob/945537c1/compiler/cpp/src/generate/t_xsd_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_xsd_generator.cc b/compiler/cpp/src/generate/t_xsd_generator.cc
index 923ec70..ef00e51 100644
--- a/compiler/cpp/src/generate/t_xsd_generator.cc
+++ b/compiler/cpp/src/generate/t_xsd_generator.cc
@@ -26,8 +26,16 @@
#include <sstream>
#include "t_generator.h"
#include "platform.h"
-using namespace std;
+using std::map;
+using std::ofstream;
+using std::ostream;
+using std::ostringstream;
+using std::string;
+using std::stringstream;
+using std::vector;
+
+static const string endl = "\n"; // avoid ostream << std::endl flushes
/**
* XSD generator, creates an XSD for the base types etc.