Merge lp:~linuxjedi/libdrizzle/5.1-compiler-fixes into lp:libdrizzle

Proposed by Andrew Hutchings on 2013-04-29
Status: Merged
Approved by: Andrew Hutchings on 2013-04-29
Approved revision: no longer in the source branch.
Merged at revision: 122
Proposed branch: lp:~linuxjedi/libdrizzle/5.1-compiler-fixes
Merge into: lp:libdrizzle
Diff against target: 34 lines (+3/-3)
2 files modified
libdrizzle/sha1.cc (+1/-1)
m4/ax_harden_compiler_flags.m4 (+2/-2)
To merge this branch: bzr merge lp:~linuxjedi/libdrizzle/5.1-compiler-fixes
Reviewer Review Type Date Requested Status
Drizzle Trunk 2013-04-29 Pending
Review via email: mp+161365@code.launchpad.net

Description of the change

Adds a suppression for the SHA1 code and reverts the earlier hacky fix I made

To post a comment you must log in.
122. By Drizzle Continuous Integration on 2013-04-29

Merge lp:~linuxjedi/libdrizzle/5.1-compiler-fixes Build: jenkins-Libdrizzle-102

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdrizzle/sha1.cc'
2--- libdrizzle/sha1.cc 2013-04-28 18:27:40 +0000
3+++ libdrizzle/sha1.cc 2013-04-29 06:15:31 +0000
4@@ -128,7 +128,7 @@
5 void
6 SHA1Update(SHA1_CTX *context, const uint8_t *data, size_t len)
7 {
8- uint32_t i, j;
9+ size_t i, j;
10
11 j = (size_t)((context->count >> 3) & 63);
12 context->count += (len << 3);
13
14=== modified file 'm4/ax_harden_compiler_flags.m4'
15--- m4/ax_harden_compiler_flags.m4 2013-04-28 18:27:40 +0000
16+++ m4/ax_harden_compiler_flags.m4 2013-04-29 06:15:31 +0000
17@@ -155,7 +155,7 @@
18 _APPEND_COMPILE_FLAGS_ERROR([-Wswitch-enum])
19 _APPEND_COMPILE_FLAGS_ERROR([-Wtrampolines])
20 _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
21- _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
22+# _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
23 _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
24 AS_IF([test "x$ac_cv_vcs_checkout" = xyes && test "x$MINGW" != xyes],[
25 _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
26@@ -275,7 +275,7 @@
27 _APPEND_COMPILE_FLAGS_ERROR([-Wswitch-enum])
28 _APPEND_COMPILE_FLAGS_ERROR([-Wtrampolines])
29 _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
30- _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
31+# _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
32 _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
33 _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat])
34 # _APPEND_COMPILE_FLAGS_ERROR([-Weffc++])

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: