Uber configure.ac/Makefile.am and configure.ac/Makefile.am for lib/php and compiler
Modified TProtocol.h et al to take collection size as unsigned int. This removes need to cast STL's default size_t to signed int and is more correct, since collection sizes cannot be < 0 by definition
Moved compiler/Makefile to compiler/cpp.mk so it doesn't get trashed by automake
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664766 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/compiler/src/php_generator.py b/compiler/src/php_generator.py
index e68a4f7..71b1fd3 100644
--- a/compiler/src/php_generator.py
+++ b/compiler/src/php_generator.py
@@ -329,8 +329,6 @@
result+= self.toReadStructEnd()
- result+= self.indent()+"return "+value+";\n"
-
return result
def toReadCollection(self, value, collection):
@@ -631,12 +629,17 @@
result+= self.indent()+"}\n"
+ result+= self.reader.toReadMessageEnd()
+
+ if not isVoidType(function.returnType()):
+ result+= self.indent()+"return "+resultVar.name+"->success;\n"
+ else:
+ result+= self.indent()+"return;\n"
+
self.indent-= 1
self.oldScope()
- result+= self.reader.toReadMessageEnd()
-
result+= self.indent()+"}\n"
return result