aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2013-10-28 20:10:16 -0500
committerJack Nagel2013-10-28 20:10:16 -0500
commit1238ab6ff5d3ffe8696b8c6133fee4061a669ffb (patch)
tree4ee0ffd8edfbd8ddb1794aac231849f04424cddf
parent21f3411b9e0a1d9e74630671098dbd3dcd0c7da3 (diff)
downloadhomebrew-1238ab6ff5d3ffe8696b8c6133fee4061a669ffb.tar.bz2
ragel: use upstream fix
-rw-r--r--Library/Formula/ragel.rb20
1 files changed, 9 insertions, 11 deletions
diff --git a/Library/Formula/ragel.rb b/Library/Formula/ragel.rb
index f850da6f6..d53ee7598 100644
--- a/Library/Formula/ragel.rb
+++ b/Library/Formula/ragel.rb
@@ -11,8 +11,7 @@ class Ragel < Formula
end
def patches
- # Fix compilation with clang
- # http://www.complang.org/pipermail/ragel-users/2013-October/003007.html
+ # Fix compilation with recent clang, patch from upstream git repo
DATA
end
@@ -25,15 +24,14 @@ end
__END__
diff --git a/ragel/javacodegen.cpp b/ragel/javacodegen.cpp
-index adff67e..2152b35 100644
+index adff67e..ff2193c 100644
--- a/ragel/javacodegen.cpp
+++ b/ragel/javacodegen.cpp
-@@ -1184,7 +1184,7 @@ std::ostream &JavaTabCodeGen::ARRAY_ITEM( string item, bool last )
- {
- item_count++;
+@@ -54,6 +54,7 @@ using std::cin;
+ using std::cout;
+ using std::cerr;
+ using std::endl;
++using std::setiosflags;
-- out << setw(5) << setiosflags(ios::right) << item;
-+ out << setw(5) << std::setiosflags(ios::right) << item;
-
- if ( !last ) {
- if ( item_count % SAIIC == 0 ) {
+ void javaLineDirective( ostream &out, const char *fileName, int line )
+ {