cataclysm-dda: build fixes for gcc 5.4.0

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Mon Nov 21 20:52:59 2016 +0200
Changeset:	25bbde795ed42b29f76ee6191d6bad8100f48961

Modified Files:
	cataclysm-dda/distinfo
Added Files:
	cataclysm-dda/patches/patch-src_bionics.cpp
	cataclysm-dda/patches/patch-src_crafting.cpp
	cataclysm-dda/patches/patch-src_editmap.cpp
	cataclysm-dda/patches/patch-src_line.h
	cataclysm-dda/patches/patch-src_mod__manager.cpp
	cataclysm-dda/patches/patch-src_monattack.cpp
	cataclysm-dda/patches/patch-src_mondeath.cpp
	cataclysm-dda/patches/patch-src_monmove.cpp
	cataclysm-dda/patches/patch-src_mtype.h
	cataclysm-dda/patches/patch-src_mutation.cpp
	cataclysm-dda/patches/patch-src_overmap.cpp
	cataclysm-dda/patches/patch-src_player.cpp
	cataclysm-dda/patches/patch-src_savegame.cpp
	cataclysm-dda/patches/patch-src_savegame__legacy.cpp
	cataclysm-dda/patches/patch-src_simplexnoise.cpp
	cataclysm-dda/patches/patch-src_tileray.cpp

Log Message:
cataclysm-dda: build fixes for gcc 5.4.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=25bbde795ed42b29f76ee6191d6bad8100f48961

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cataclysm-dda/distinfo                             | 16 ++++++++++
 cataclysm-dda/patches/patch-src_bionics.cpp        | 15 +++++++++
 cataclysm-dda/patches/patch-src_crafting.cpp       | 15 +++++++++
 cataclysm-dda/patches/patch-src_editmap.cpp        | 15 +++++++++
 cataclysm-dda/patches/patch-src_line.h             | 15 +++++++++
 cataclysm-dda/patches/patch-src_mod__manager.cpp   | 15 +++++++++
 cataclysm-dda/patches/patch-src_monattack.cpp      | 17 ++++++++++
 cataclysm-dda/patches/patch-src_mondeath.cpp       | 15 +++++++++
 cataclysm-dda/patches/patch-src_monmove.cpp        | 20 ++++++++++++
 cataclysm-dda/patches/patch-src_mtype.h            | 15 +++++++++
 cataclysm-dda/patches/patch-src_mutation.cpp       | 15 +++++++++
 cataclysm-dda/patches/patch-src_overmap.cpp        | 15 +++++++++
 cataclysm-dda/patches/patch-src_player.cpp         | 36 ++++++++++++++++++++++
 cataclysm-dda/patches/patch-src_savegame.cpp       | 15 +++++++++
 .../patches/patch-src_savegame__legacy.cpp         | 15 +++++++++
 cataclysm-dda/patches/patch-src_simplexnoise.cpp   | 15 +++++++++
 cataclysm-dda/patches/patch-src_tileray.cpp        | 16 ++++++++++
 17 files changed, 285 insertions(+)

diffs:
diff --git a/cataclysm-dda/distinfo b/cataclysm-dda/distinfo
index e5760ba..5f594b0 100644
--- a/cataclysm-dda/distinfo
+++ b/cataclysm-dda/distinfo
@@ -4,3 +4,19 @@ SHA1 (cataclysm-dda/0.C.tar.gz) = 37e317a75e7bf7e3425da86382551958d890e872
 RMD160 (cataclysm-dda/0.C.tar.gz) = c0f95a7a2902094444e07e6175e2494abfe0eea3
 Size (cataclysm-dda/0.C.tar.gz) = 26887684 bytes
 SHA1 (patch-Makefile) = ff6e92afd04a889803ffb045649d6a2774ffbe64
+SHA1 (patch-src_bionics.cpp) = b715ced76ae573b4f1c4053cb8a607ca21c81fa9
+SHA1 (patch-src_crafting.cpp) = eb9ccc4d57b3620127b4c6d5a124a6906e8b12e9
+SHA1 (patch-src_editmap.cpp) = a97da923caf9be218b3f4ae60d60200d8a2f8f1e
+SHA1 (patch-src_line.h) = b551e0ec68e975badd80f23d8db9d4fab151769e
+SHA1 (patch-src_mod__manager.cpp) = 31b5788af55d43dffa855fa12a22e7a8257e32eb
+SHA1 (patch-src_monattack.cpp) = ac61c07cce58d5a94b934c2574f5e4f0220dfc5d
+SHA1 (patch-src_mondeath.cpp) = 293ab32df372cd024ea78375f4704688a7954332
+SHA1 (patch-src_monmove.cpp) = c1b7bb08d953687f54fb62535527acfa39430b34
+SHA1 (patch-src_mtype.h) = 4af46262bf0ea55bb03ef858d870d1522c57acf0
+SHA1 (patch-src_mutation.cpp) = 5ecbc3568ec2774663666eeb542c7a5bd0ebfc24
+SHA1 (patch-src_overmap.cpp) = 5b82d28166a874cc212f35d3c6a92917f8906ddd
+SHA1 (patch-src_player.cpp) = 110fc14bd09b2c70aa6c4d9bd1b344d634f70843
+SHA1 (patch-src_savegame.cpp) = 3d44743f2f6f51c4bdc1cf1f8341c3aad9612ff1
+SHA1 (patch-src_savegame__legacy.cpp) = ccbcba62014ee5a73fdc2936a17cac16eb116e9d
+SHA1 (patch-src_simplexnoise.cpp) = c793c44e662d720f2a20f3424a0a1c79614b81ed
+SHA1 (patch-src_tileray.cpp) = 5d441d263fceec3e4feaeb44623d78b4124ae845
diff --git a/cataclysm-dda/patches/patch-src_bionics.cpp b/cataclysm-dda/patches/patch-src_bionics.cpp
new file mode 100644
index 0000000..8252454
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_bionics.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/bionics.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/bionics.cpp
+@@ -10,7 +10,7 @@
+ #include "overmapbuffer.h"
+ #include "sounds.h"
+ 
+-#include <math.h>    //sqrt
++#include <cmath>     //sqrt
+ #include <algorithm> //std::min
+ #include <sstream>
+ 
diff --git a/cataclysm-dda/patches/patch-src_crafting.cpp b/cataclysm-dda/patches/patch-src_crafting.cpp
new file mode 100644
index 0000000..1c05631
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_crafting.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/crafting.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/crafting.cpp
+@@ -13,7 +13,7 @@
+ #include "messages.h"
+ #include "itype.h"
+ #include <queue>
+-#include <math.h>    //sqrt
++#include <cmath>     //sqrt
+ #include <algorithm> //std::min
+ 
+ enum TAB_MODE {
diff --git a/cataclysm-dda/patches/patch-src_editmap.cpp b/cataclysm-dda/patches/patch-src_editmap.cpp
new file mode 100644
index 0000000..b87098b
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_editmap.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/editmap.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/editmap.cpp
+@@ -23,7 +23,7 @@
+ #include <set>
+ #include <algorithm>
+ #include <string>
+-#include <math.h>
++#include <cmath>
+ #include <vector>
+ #include <cstdlib>
+ #include "debug.h"
diff --git a/cataclysm-dda/patches/patch-src_line.h b/cataclysm-dda/patches/patch-src_line.h
new file mode 100644
index 0000000..f957f71
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_line.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/line.h.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/line.h
+@@ -4,7 +4,7 @@
+ #include <vector>
+ #include <string>
+ #include "enums.h"
+-#include <math.h>
++#include <cmath>
+ 
+ enum direction {
+     NORTH = 0,
diff --git a/cataclysm-dda/patches/patch-src_mod__manager.cpp b/cataclysm-dda/patches/patch-src_mod__manager.cpp
new file mode 100644
index 0000000..c48c263
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_mod__manager.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/mod_manager.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/mod_manager.cpp
+@@ -5,7 +5,7 @@
+ #include "worldfactory.h"
+ #include "path_info.h"
+ 
+-#include <math.h>
++#include <cmath>
+ #include <queue>
+ #include <iostream>
+ #include <fstream>
diff --git a/cataclysm-dda/patches/patch-src_monattack.cpp b/cataclysm-dda/patches/patch-src_monattack.cpp
new file mode 100644
index 0000000..aa5da55
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_monattack.cpp
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/monattack.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/monattack.cpp
+@@ -16,8 +16,8 @@
+ #include <algorithm>
+ 
+ //Used for e^(x) functions
+-#include <stdio.h>
+-#include <math.h>
++#include <cstdio>
++#include <cmath>
+ 
+ // for loading monster dialogue:
+ #include <iostream>
diff --git a/cataclysm-dda/patches/patch-src_mondeath.cpp b/cataclysm-dda/patches/patch-src_mondeath.cpp
new file mode 100644
index 0000000..fbbf8ed
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_mondeath.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/mondeath.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/mondeath.cpp
+@@ -8,7 +8,7 @@
+ #include "sounds.h"
+ #include "mondeath.h"
+ 
+-#include <math.h>  // rounding
++#include <cmath>  // rounding
+ #include <sstream>
+ 
+ void mdeath::normal(monster *z)
diff --git a/cataclysm-dda/patches/patch-src_monmove.cpp b/cataclysm-dda/patches/patch-src_monmove.cpp
new file mode 100644
index 0000000..759cb16
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_monmove.cpp
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/monmove.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/monmove.cpp
+@@ -12,10 +12,10 @@
+ #include "monattack.h"
+ #include "monstergenerator.h"
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ //Used for e^(x) functions
+-#include <stdio.h>
+-#include <math.h>
++#include <cstdio>
++#include <cmath>
+ 
+ #define MONSTER_FOLLOW_DIST 8
+ 
diff --git a/cataclysm-dda/patches/patch-src_mtype.h b/cataclysm-dda/patches/patch-src_mtype.h
new file mode 100644
index 0000000..64e3126
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_mtype.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/mtype.h.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/mtype.h
+@@ -12,7 +12,7 @@
+ #include <string>
+ #include <vector>
+ #include <set>
+-#include <math.h>
++#include <cmath>
+ 
+ class Creature;
+ 
diff --git a/cataclysm-dda/patches/patch-src_mutation.cpp b/cataclysm-dda/patches/patch-src_mutation.cpp
new file mode 100644
index 0000000..177aa28
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_mutation.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/mutation.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/mutation.cpp
+@@ -8,7 +8,7 @@
+ #include "overmapbuffer.h"
+ #include "sounds.h"
+ 
+-#include <math.h>    //sqrt
++#include <cmath>     //sqrt
+ #include <algorithm> //std::min
+ #include <sstream>
+ 
diff --git a/cataclysm-dda/patches/patch-src_overmap.cpp b/cataclysm-dda/patches/patch-src_overmap.cpp
new file mode 100644
index 0000000..42714ef
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_overmap.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/overmap.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/overmap.cpp
+@@ -1,6 +1,6 @@
+ #include <stdlib.h>
+-#include <time.h>
+-#include <math.h>
++#include <ctime>
++#include <cmath>
+ #include <fstream>
+ #include <vector>
+ #include <sstream>
diff --git a/cataclysm-dda/patches/patch-src_player.cpp b/cataclysm-dda/patches/patch-src_player.cpp
new file mode 100644
index 0000000..9a06611
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_player.cpp
@@ -0,0 +1,36 @@
+$NetBSD$
+
+Fix includes.
+auto_ptr is deprecated.
+
+--- src/player.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/player.cpp
+@@ -9,7 +9,7 @@
+ #include "inventory.h"
+ #include "options.h"
+ #include <sstream>
+-#include <stdlib.h>
++#include <cstdlib>
+ #include "weather.h"
+ #include "item.h"
+ #include "material.h"
+@@ -28,8 +28,8 @@
+ #include "sounds.h"
+ 
+ //Used for e^(x) functions
+-#include <stdio.h>
+-#include <math.h>
++#include <cstdio>
++#include <cmath>
+ 
+ #include <ctime>
+ #include <algorithm>
+@@ -9788,7 +9788,7 @@ void player::pick_style() // Style selec
+ 
+     uimenu kmenu;
+     kmenu.text = _("Select a style (press ? for style info)");
+-    std::auto_ptr<ma_style_callback> ma_style_info(new ma_style_callback());
++    std::unique_ptr<ma_style_callback> ma_style_info(new ma_style_callback());
+     kmenu.callback = ma_style_info.get();
+     kmenu.addentry( 0, true, 'c', _("Cancel") );
+     if (keep_hands_free) {
diff --git a/cataclysm-dda/patches/patch-src_savegame.cpp b/cataclysm-dda/patches/patch-src_savegame.cpp
new file mode 100644
index 0000000..8e7e347
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_savegame.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/savegame.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/savegame.cpp
+@@ -23,7 +23,7 @@
+ #include <string>
+ #include <fstream>
+ #include <sstream>
+-#include <math.h>
++#include <cmath>
+ #include <vector>
+ #include "debug.h"
+ #include "weather.h"
diff --git a/cataclysm-dda/patches/patch-src_savegame__legacy.cpp b/cataclysm-dda/patches/patch-src_savegame__legacy.cpp
new file mode 100644
index 0000000..b2d2eff
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_savegame__legacy.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/savegame_legacy.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/savegame_legacy.cpp
+@@ -44,7 +44,7 @@
+ #include <string>
+ #include <fstream>
+ #include <sstream>
+-#include <math.h>
++#include <cmath>
+ #include <vector>
+ 
+ #define ARRAY_SIZE(array) ( sizeof( array ) / sizeof( array[0] ) )
diff --git a/cataclysm-dda/patches/patch-src_simplexnoise.cpp b/cataclysm-dda/patches/patch-src_simplexnoise.cpp
new file mode 100644
index 0000000..d82c8f9
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_simplexnoise.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/simplexnoise.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/simplexnoise.cpp
+@@ -16,7 +16,7 @@
+  */
+ 
+ 
+-#include <math.h>
++#include <cmath>
+ 
+ #include "simplexnoise.h"
+ 
diff --git a/cataclysm-dda/patches/patch-src_tileray.cpp b/cataclysm-dda/patches/patch-src_tileray.cpp
new file mode 100644
index 0000000..e0d893d
--- /dev/null
+++ b/cataclysm-dda/patches/patch-src_tileray.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix includes.
+
+--- src/tileray.cpp.orig	2015-03-09 05:25:34.000000000 +0000
++++ src/tileray.cpp
+@@ -1,7 +1,7 @@
+ #include "tileray.h"
+ #include "game_constants.h"
+-#include <math.h>
+-#include <stdlib.h>
++#include <cmath>
++#include <cstdlib>
+ 
+ static const int sx[4] = { 1, -1, -1, 1 };
+ static const int sy[4] = { 1, 1, -1, -1 };