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
|
--- a/mars-client/src/dhsbase.c
+++ b/mars-client/src/dhsbase.c
@@ -1687,7 +1687,7 @@
size = stream_read_longlong(&dhs->s);
- while ((len = readtcp(&dhs->control_socket, buffer, n)) >= 0)
+ while ((len = readtcp((void*) &dhs->control_socket, buffer, n)) >= 0)
total += len;
marslog(LOG_INFO, "%lld bytes received", total);
--- a/mars-client/src/stream.c
+++ b/mars-client/src/stream.c
@@ -423,8 +423,8 @@
void make_socket_stream(mstream* s, int* soc) {
s->error = 0;
- s->read = readtcp;
- s->write = writetcp;
+ s->read = (xdrproc) readtcp;
+ s->write = (xdrproc) writetcp;
s->data = soc;
s->in = 0;
s->out = 0;
--- a/metview/src/uPlot/MacroConverter.cc
+++ b/metview/src/uPlot/MacroConverter.cc
@@ -11,6 +11,7 @@
#include "MacroConverter.h"
+#include <algorithm>
#include <fstream>
#include <set>
#include <string>
@@ -171,7 +172,7 @@
in.close();
// Convert duName to lowercase, as function mvimport uses lowercase
- std::transform(duName.begin(), duName.end(), duName.begin(), ::tolower);
+ std::transform(duName.begin(), duName.end(), duName.begin(), ::tolower);
}
unlink(tmpName.c_str());
--- a/metview/src/uPlot/MvDecoder.cc
+++ b/metview/src/uPlot/MvDecoder.cc
@@ -15,6 +15,8 @@
#include <algorithm>
+#include <algorithm>
+
#include "MvDecoder.h"
#include "MvGribDecoder.h"
#include "ObjectList.h"
--- a/metview/src/uPlot/Page.cc
+++ b/metview/src/uPlot/Page.cc
@@ -13,6 +13,8 @@
#include <algorithm>
+#include <algorithm>
+
#include "Page.h"
#include <Assertions.hpp>
--- a/metview/src/uPlot/Presentable.cc
+++ b/metview/src/uPlot/Presentable.cc
@@ -9,6 +9,7 @@
#include "Presentable.h"
+#include <algorithm>
#include <sstream>
#include <algorithm>
--- a/metview/src/uPlot/SuperPage.cc
+++ b/metview/src/uPlot/SuperPage.cc
@@ -12,6 +12,8 @@
#include <algorithm>
+#include <algorithm>
+
#ifndef NOMETVIEW_QT
#include "uPlotBase.h"
#endif
--- a/metview/src/uPlot/ThermoView.cc
+++ b/metview/src/uPlot/ThermoView.cc
@@ -9,6 +9,8 @@
#include <algorithm>
+#include <algorithm>
+
#include "ThermoView.h"
#include "MvRequestUtil.hpp"
#include "ObjectList.h"
|
