Wallch

Merge lp:~jakuje/wallpaper-changer/require-cmath into lp:wallpaper-changer

  1. require-cmath
  2. Merge into trunk
Proposed by Jakuje
Status: Needs review
Proposed branch: lp:~jakuje/wallpaper-changer/require-cmath
Merge into: lp:wallpaper-changer
Diff against target: 15 lines (+2/-2)
1 file modified
src/tools/nonguimanager.cpp (+2/-2)
To merge this branch: bzr merge lp:~jakuje/wallpaper-changer/require-cmath
Reviewer Review Type Date Requested Status
Wallch Team Pending
Review via email: mp+294895@code.launchpad.net

Commit message

Add missing header file cmath for gcc6 (more strict)

Description of the change

GCC6 is more strict than the previous version an requires explicit header files for mathematical functions (floor). Therefore moving

    #include <cmath>

out of the conditional block for Windows.

To post a comment you must log in.

Unmerged revisions

214. By Jakuje

Add missing header file cmath for gcc6 (more strict)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/tools/nonguimanager.cpp'
2--- src/tools/nonguimanager.cpp 2015-08-25 14:34:01 +0000
3+++ src/tools/nonguimanager.cpp 2016-05-17 10:12:06 +0000
4@@ -27,9 +27,9 @@
5 #include <iostream>
6 #include <getopt.h>
7
8-#ifdef Q_OS_WIN
9-
10 #include <cmath>
11+
12+#ifdef Q_OS_WIN
13 #include <Windows.h>
14
15 #endif //#ifdef Q_OS_WIN

Subscribers

People subscribed via source and target branches