From: Mark Slee Date: Mon, 25 Sep 2006 21:32:05 +0000 (+0000) Subject: Change thrift require_once to include_once X-Git-Tag: 0.2.0~1669 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=1c4a559bc18eae4ae68f6922f5814441b8fc070e;p=common%2Fthrift.git Change thrift require_once to include_once Summary: As per Lucas' request Reviewed By: lucas git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664803 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/compiler/cpp/src/generate/t_php_generator.cc b/compiler/cpp/src/generate/t_php_generator.cc index bfbec9c1..de816dc0 100644 --- a/compiler/cpp/src/generate/t_php_generator.cc +++ b/compiler/cpp/src/generate/t_php_generator.cc @@ -30,7 +30,7 @@ void t_php_generator::init_generator(t_program* tprogram) { */ string t_php_generator::php_includes() { return - string("require_once $GLOBALS['THRIFT_ROOT'].'/Thrift.php';\n\n"); + string("include_once $GLOBALS['THRIFT_ROOT'].'/Thrift.php';\n\n"); } /** @@ -341,7 +341,7 @@ void t_php_generator::generate_service(t_service* tservice) { php_includes(); f_service_ << - "require_once $GLOBALS['THRIFT_ROOT'].'/packages/" << program_name_ << "/" << program_name_ << "_types.php';" << endl << endl; + "include_once $GLOBALS['THRIFT_ROOT'].'/packages/" << program_name_ << "/" << program_name_ << "_types.php';" << endl << endl; // Generate the three main parts of the service (well, two for now in PHP) generate_service_interface(tservice); diff --git a/lib/php/src/protocol/TBinaryProtocol.php b/lib/php/src/protocol/TBinaryProtocol.php index 4123f5f8..dd4408fe 100644 --- a/lib/php/src/protocol/TBinaryProtocol.php +++ b/lib/php/src/protocol/TBinaryProtocol.php @@ -1,7 +1,7 @@