diff options
author | Justin Lecher <jlec@gentoo.org> | 2011-08-15 17:43:28 +0200 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2011-08-15 17:43:28 +0200 |
commit | 169876e17654102be38af48217b48079ca293c8e (patch) | |
tree | 2c393400d98fb3496726a117147e67c61b83b782 /media-gfx/librecad/files | |
parent | Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci (diff) | |
download | sci-169876e17654102be38af48217b48079ca293c8e.tar.gz sci-169876e17654102be38af48217b48079ca293c8e.tar.bz2 sci-169876e17654102be38af48217b48079ca293c8e.zip |
Cleaned ebuilds
(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'media-gfx/librecad/files')
-rw-r--r-- | media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch b/media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch new file mode 100644 index 000000000..b912801d6 --- /dev/null +++ b/media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch @@ -0,0 +1,38 @@ + fparser/fparser.cc | 4 ++-- + src/lib/engine/rs_ellipse.cpp | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/fparser/fparser.cc b/fparser/fparser.cc +index 49e6ae0..0e65dbb 100644 +--- a/fparser/fparser.cc ++++ b/fparser/fparser.cc +@@ -899,7 +899,7 @@ namespace + byte -= n; + if(byte > (unsigned char)('9'-n)) return false; + unsigned long shifted = 1UL << byte; +- const unsigned long mask = LiteralMask<Value_t, n>::mask; ++ const unsigned long mask = LiteralMask<Value_t, static_cast<unsigned int>(n)>::mask; + return (mask & shifted) != 0; + } + +@@ -956,7 +956,7 @@ U+000B \v + if(byte <= (unsigned char)(' '-n)) + { + unsigned long shifted = 1UL << byte; +- const unsigned long mask = SimpleSpaceMask<n>::mask; ++ const unsigned long mask = SimpleSpaceMask<static_cast<unsigned int>(n)>::mask; + if(mask & shifted) + { ++function; continue; } // \r, \n, \t, \v and space + break; +diff --git a/src/lib/engine/rs_ellipse.cpp b/src/lib/engine/rs_ellipse.cpp +index 452de0a..7ccc807 100644 +--- a/src/lib/engine/rs_ellipse.cpp ++++ b/src/lib/engine/rs_ellipse.cpp +@@ -24,6 +24,7 @@ + ** + **********************************************************************/ + ++#include <algorithm> + + #include "rs_ellipse.h" + |