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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
diff -ur amos-2.0.8.orig/src/Align/align.cc amos-2.0.8/src/Align/align.cc
--- amos-2.0.8.orig/src/Align/align.cc 2008-03-19 16:07:24.000000000 +0200
+++ amos-2.0.8/src/Align/align.cc 2009-07-30 19:40:51.000000000 +0300
@@ -247,7 +247,7 @@
// Add incr_val to the after count in this Vote_t for ch .
{
- char * p;
+ const char * p;
p = strchr (ALPHABET, tolower (ch));
if (p == NULL)
@@ -285,7 +285,7 @@
// count for a blank.
{
- char * p;
+ const char * p;
p = strchr (ALPHABET, tolower (ch));
if (p == NULL)
@@ -357,7 +357,7 @@
{
int i;
- char * p;
+ const char * p;
for (i = 0; i <= ALPHABET_SIZE; i ++)
here [i] = after [i] = 0;
diff -ur amos-2.0.8.orig/src/Align/align_poly.cc amos-2.0.8/src/Align/align_poly.cc
--- amos-2.0.8.orig/src/Align/align_poly.cc 2006-03-30 05:03:12.000000000 +0300
+++ amos-2.0.8/src/Align/align_poly.cc 2009-07-30 19:43:44.000000000 +0300
@@ -247,7 +247,7 @@
// Add 1 to the after count in this Vote_t for ch .
{
- char * p;
+ const char * p;
p = strchr (ALPHABET, tolower (ch));
if (p == NULL)
@@ -285,7 +285,7 @@
// count for a blank.
{
- char * p;
+ const char * p;
p = strchr (ALPHABET, tolower (ch));
if (p == NULL)
@@ -357,7 +357,7 @@
{
int i;
- char * p;
+ const char * p;
for (i = 0; i <= ALPHABET_SIZE; i ++)
here [i] = after [i] = 0;
diff -ur amos-2.0.8.orig/src/AMOS/IDMap_AMOS.cc amos-2.0.8/src/AMOS/IDMap_AMOS.cc
--- amos-2.0.8.orig/src/AMOS/IDMap_AMOS.cc 2006-11-21 17:45:46.000000000 +0200
+++ amos-2.0.8/src/AMOS/IDMap_AMOS.cc 2009-07-30 19:30:03.000000000 +0300
@@ -10,6 +10,7 @@
#include "IDMap_AMOS.hh"
#include <string>
#include <sstream>
+#include <cstdio>
#include <cstring>
using namespace AMOS;
using namespace std;
diff -ur amos-2.0.8.orig/src/AMOS/Message_AMOS.cc amos-2.0.8/src/AMOS/Message_AMOS.cc
--- amos-2.0.8.orig/src/AMOS/Message_AMOS.cc 2005-01-07 23:53:05.000000000 +0200
+++ amos-2.0.8/src/AMOS/Message_AMOS.cc 2009-07-30 19:32:21.000000000 +0300
@@ -7,6 +7,8 @@
//!
////////////////////////////////////////////////////////////////////////////////
+#include <cstdio>
+
#include "Message_AMOS.hh"
using namespace AMOS;
using namespace std;
diff -ur amos-2.0.8.orig/src/Common/amp.cc amos-2.0.8/src/Common/amp.cc
--- amos-2.0.8.orig/src/Common/amp.cc 2006-10-25 16:56:41.000000000 +0300
+++ amos-2.0.8/src/Common/amp.cc 2009-07-30 19:33:59.000000000 +0300
@@ -1,6 +1,7 @@
#include "amp.hh"
#include <new>
#include <iostream>
+#include <cstdio>
#include <cstring>
#include <ctime>
using namespace std;
diff -ur amos-2.0.8.orig/src/Foundation/FileSystem.cc amos-2.0.8/src/Foundation/FileSystem.cc
--- amos-2.0.8.orig/src/Foundation/FileSystem.cc 2005-07-09 00:52:03.000000000 +0300
+++ amos-2.0.8/src/Foundation/FileSystem.cc 2009-07-30 19:35:48.000000000 +0300
@@ -55,7 +55,7 @@
{
// Check to see if path was given
- char * end_of_path = strrchr(filename, PATH_DELIMINATOR);
+ const char * end_of_path = strrchr(filename, PATH_DELIMINATOR);
if (end_of_path)
{
diff -ur amos-2.0.8.orig/src/Foundation/Options.cc amos-2.0.8/src/Foundation/Options.cc
--- amos-2.0.8.orig/src/Foundation/Options.cc 2008-06-22 18:19:07.000000000 +0300
+++ amos-2.0.8/src/Foundation/Options.cc 2009-07-30 19:37:40.000000000 +0300
@@ -26,6 +26,7 @@
*/
#include "Options.hh"
+#include <cstdio>
#include <cstring>
//! Constructor takes command line options in standard argc, argv format
|