From 5cac98c659b2fa14ff08f9acd6907786644e250a Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Thu, 6 Sep 2012 17:59:55 +0000 Subject: [PATCH] THRIFT-1686 t_php_generator.cc uses "and" instead of "&&", and causes compiler errors with Visual Studio Patch: Ben Craig git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1381696 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_php_generator.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/cpp/src/generate/t_php_generator.cc b/compiler/cpp/src/generate/t_php_generator.cc index 74c3af33..d728fbfd 100644 --- a/compiler/cpp/src/generate/t_php_generator.cc +++ b/compiler/cpp/src/generate/t_php_generator.cc @@ -2274,7 +2274,7 @@ string t_php_generator::argument_list(t_struct* tstruct, bool addStructSignature t_type* type = (*f_iter)->get_type(); //Set type name - if(addStructSignature and type->is_struct()) + if(addStructSignature && type->is_struct()) { string className = php_namespace(type->get_program()) + php_namespace_directory("Definition", false) + classify(type->get_name()); -- 2.17.1