Date: Mon, 29 Aug 2011 13:50:17 +0800 (CST) From: Stephon Chen <stephon@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: skv@FreeBSD.org Subject: ports/160271: [PATCH] devel/thrift: fix compile error with fb303, patch included Message-ID: <201108290550.p7T5oH1S058486@empty-1-25> Resent-Message-ID: <201108290600.p7T60NSu072463@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160271
>Category: ports
>Synopsis: [PATCH] devel/thrift: fix compile error with fb303, patch included
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 29 06:00:23 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Stephon Chen
>Release: FreeBSD 8.2-RELEASE amd64
>Organization:
PIXNET
>Environment:
System: FreeBSD 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011
>Description:
Add t_cpp_generator.cpp patch
Added file(s):
- files/patch-t-cpp-generator.ac
Port maintainer (skv@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- thrift-0.6.1,3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/thrift/Makefile /net/account/admin/stephon/ports/devel/thrift/Makefile
--- /usr/ports/devel/thrift/Makefile 2011-08-29 13:19:34.000000000 +0800
+++ /net/account/admin/stephon/ports/devel/thrift/Makefile 2011-08-29 13:45:50.251012000 +0800
@@ -7,7 +7,7 @@
PORTNAME= thrift
PORTVERSION= 0.6.1
-PORTEPOCH= 2
+PORTEPOCH= 3
CATEGORIES= devel
MASTER_SITES= APACHE
MASTER_SITE_SUBDIR= /thrift/${PORTVERSION}
diff -ruN --exclude=CVS /usr/ports/devel/thrift/files/patch-t-cpp-generator.ac /net/account/admin/stephon/ports/devel/thrift/files/patch-t-cpp-generator.ac
--- /usr/ports/devel/thrift/files/patch-t-cpp-generator.ac 1970-01-01 08:00:00.000000000 +0800
+++ /net/account/admin/stephon/ports/devel/thrift/files/patch-t-cpp-generator.ac 2011-08-29 13:44:49.762773000 +0800
@@ -0,0 +1,16 @@
+--- compiler/cpp/src/generate/t_cpp_generator.cc
++++ compiler/cpp/src/generate/t_cpp_generator.cc
+@@ -506,7 +506,11 @@ void t_cpp_generator::generate_enum(t_enum* tenum) {
+ /**
+ Generate a character array of enum names for debugging purposes.
+ */
+- std::string prefix = tenum->get_name() + "::";
++ std::string prefix = "";
++ if (!gen_pure_enums_) {
++ prefix = tenum->get_name() + "::";
++ }
++
+ f_types_impl_ <<
+ indent() << "int _k" << tenum->get_name() << "Values[] =";
+ generate_enum_constant_list(f_types_impl_, constants, prefix.c_str(), "", false);
+
--- thrift-0.6.1,3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108290550.p7T5oH1S058486>