media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
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"