diff options
author | Jake Farrell <jfarrell@apache.org> | 2011-10-20 02:49:48 +0000 |
---|---|---|
committer | Jake Farrell <jfarrell@apache.org> | 2011-10-20 02:49:48 +0000 |
commit | 3b54621793a9c0ff45ad6e5b32600dad5f888bcd (patch) | |
tree | aac3fe273b204e3fbb6cb02c9ab1aa60cca7b23e | |
parent | c92b65311c7b2c5582404da9674bbfa60592d9ba (diff) | |
download | thrift-3b54621793a9c0ff45ad6e5b32600dad5f888bcd.tar.gz |
Thrift-1396: Dephi generator has dependacy on boost 1.42 later.
Client: delphi
Patch: Kenjiro Fukumitsu
Patch to fully remove boost uuid within the delphi generator.
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1186603 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | compiler/cpp/src/generate/t_delphi_generator.cc | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/compiler/cpp/src/generate/t_delphi_generator.cc b/compiler/cpp/src/generate/t_delphi_generator.cc index a346f6df5..1a98cf0fc 100644 --- a/compiler/cpp/src/generate/t_delphi_generator.cc +++ b/compiler/cpp/src/generate/t_delphi_generator.cc @@ -30,10 +30,6 @@ #include <sys/stat.h> #include <sstream> -#include <boost/uuid/uuid.hpp> -#include <boost/uuid/uuid_generators.hpp> -#include <boost/uuid/uuid_io.hpp> - #include "platform.h" #include "t_oop_generator.h" @@ -56,9 +52,6 @@ class t_delphi_generator : public t_oop_generator iter = parsed_options.find("ansistr_binary"); ansistr_binary_ = (iter != parsed_options.end()); - iter = parsed_options.find("suppress_guid"); - suppress_guid_ = (iter != parsed_options.end()); - out_dir_base_ = "gen-delphi"; escape_.clear(); escape_['\''] = "''"; @@ -196,10 +189,6 @@ class t_delphi_generator : public t_oop_generator bool is_void( t_type* type ); int indent_impl_; bool ansistr_binary_; - bool suppress_guid_; - - std::string generate_guid(); - void indent_up_impl(){ ++indent_impl_; }; @@ -219,21 +208,6 @@ class t_delphi_generator : public t_oop_generator }; }; -/** - * Generates a new UUID/GUID for internal purposes. - * These GUIDs are not intended to be used cross-module, - * as they are always re-generated and NOT constant! - * - * @return Pascal-style GUID. - */ -std::string t_delphi_generator::generate_guid() { - boost::uuids::basic_random_generator<boost::mt19937> gen; - boost::uuids::uuid u = gen(); - std::ostringstream stream; - stream << u; - return "['{" + upcase_string(stream.str()) + "}']"; -} - bool t_delphi_generator::find_keyword( std::map<std::string, int>& keyword_map, std::string name) { int len = name.length(); @@ -497,7 +471,6 @@ void t_delphi_generator::close_generator() { f_all << "const" << endl; indent_up(); indent(f_all) << "c" << tmp_unit << "_Option_AnsiStr_Binary = " << ( ansistr_binary_ ? "True" : "False") << ";" << endl; - indent(f_all) << "c" << tmp_unit << "_Option_Suppress_GUID = " << ( suppress_guid_ ? "True" : "False") << ";" << endl << endl; indent_down(); f_all << "type" << endl; @@ -950,10 +923,6 @@ void t_delphi_generator::generate_delphi_struct_definition(ostream &out, t_struc indent(out) << struct_intf_name << " = interface(IBase)" << endl; indent_up(); - if (! suppress_guid_) { - indent(out) << generate_guid() << endl; - } - for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) { generate_delphi_property_reader_definition( out, *m_iter); generate_delphi_property_writer_definition( out, *m_iter); @@ -1136,11 +1105,6 @@ void t_delphi_generator::generate_service_interface(t_service* tservice) { } indent_up(); - - if (! suppress_guid_) { - indent(s_service) << generate_guid() << endl; - } - vector<t_function*> functions = tservice->get_functions(); vector<t_function*>::iterator f_iter; for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) @@ -2683,6 +2647,5 @@ bool t_delphi_generator::is_void( t_type* type ) { } THRIFT_REGISTER_GENERATOR(delphi, "delphi", -" ansistr_binary: Use AnsiString as binary properties.\n" \ -" suppress_guid: Suppress GUID for interface declaretion.\n") +" ansistr_binary: Use AnsiString as binary properties.\n") |