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
|
diff -ruN old/src/mbase/project/table.cpp new/src/mbase/project/table.cpp
--- old/src/mbase/project/table.cpp 2022-02-04 22:35:45.903951084 +0330
+++ new/src/mbase/project/table.cpp 2022-02-04 22:33:44.542891731 +0330
@@ -29,6 +29,7 @@
#include "theme.h"
#include <mbase/resources.h>
+#include <boost/filesystem/directory.hpp>
const char* APROJECT_VERSION = "1.2.4";
diff -ruN old/src/mgui/editor/toolbar.cpp new/src/mgui/editor/toolbar.cpp
--- old/src/mgui/editor/toolbar.cpp 2016-04-10 15:15:39.000000000 +0430
+++ new/src/mgui/editor/toolbar.cpp 2022-02-04 22:33:44.542891731 +0330
@@ -45,6 +45,8 @@
#include <mlib/sdk/logger.h>
#include <mlib/range/enumerate.h>
+#include <boost/filesystem/directory.hpp>
+
namespace Editor
{
diff -ruN old/src/mgui/project/mconstructor.cpp new/src/mgui/project/mconstructor.cpp
--- old/src/mgui/project/mconstructor.cpp 2016-04-10 15:15:39.000000000 +0430
+++ new/src/mgui/project/mconstructor.cpp 2022-02-04 22:33:44.542891731 +0330
@@ -52,6 +52,8 @@
// COPY_N_PASTE_ETALON из go-file.c, проект Gnumeric, http://projects.gnome.org/gnumeric/
//
+#include <boost/filesystem/directory.hpp>
+
#ifndef GOFFICE_WITH_GNOME
static char *
check_program (char const *prog)
diff -ruN old/src/mlib/filesystem.cpp new/src/mlib/filesystem.cpp
--- old/src/mlib/filesystem.cpp 2022-02-04 22:35:45.907284447 +0330
+++ new/src/mlib/filesystem.cpp 2022-02-04 22:33:44.542891731 +0330
@@ -30,6 +30,7 @@
#if BOOST_MINOR_VERSION >= 51
#define BOOST_FS_3 boost::filesystem
#include <boost/filesystem/path_traits.hpp> // boost::filesystem::convert()
+#include <boost/filesystem/directory.hpp>
#else
#define BOOST_FS_3 boost::filesystem3
#include <boost/filesystem/v3/path_traits.hpp>
diff -ruN old/src/mlib/read_stream.h new/src/mlib/read_stream.h
--- old/src/mlib/read_stream.h 2016-04-10 15:15:39.000000000 +0430
+++ new/src/mlib/read_stream.h 2022-02-04 22:33:44.542891731 +0330
@@ -22,6 +22,8 @@
#ifndef __MLIB_READ_STREAM_H__
#define __MLIB_READ_STREAM_H__
+#include <boost/mpl/bool.hpp>
+
#include "stream.h"
#include "filesystem.h"
diff -ruN old/src/mlib/regex.cpp new/src/mlib/regex.cpp
--- old/src/mlib/regex.cpp 2016-04-10 15:15:39.000000000 +0430
+++ new/src/mlib/regex.cpp 2022-02-04 22:33:44.542891731 +0330
@@ -22,7 +22,7 @@
#include "regex.h"
#include "string.h"
-#include <boost/regex.hpp>
+#include <boost/regex/v4/regex.hpp>
namespace re
{
diff -ruN old/src/mlib/regex.h new/src/mlib/regex.h
--- old/src/mlib/regex.h 2022-02-04 22:35:35.320525320 +0330
+++ new/src/mlib/regex.h 2022-02-04 22:34:29.913287618 +0330
@@ -27,6 +27,7 @@
#include <boost/regex/v4/regbase.hpp>
#include <boost/regex/v4/match_flags.hpp>
+#include <boost/mpl/bool.hpp>
#include <mlib/ptr.h>
#include <string>
diff -ruN old/src/mlib/sdk/bfs.h new/src/mlib/sdk/bfs.h
--- old/src/mlib/sdk/bfs.h 2016-04-10 15:15:39.000000000 +0430
+++ new/src/mlib/sdk/bfs.h 2022-02-04 22:33:44.542891731 +0330
@@ -7,6 +7,7 @@
//#define BOOST_FILESYSTEM_NO_DEPRECATED
#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/exception.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/convenience.hpp> // fs::create_directories()
diff -ruN old/src/mlib/tech.h new/src/mlib/tech.h
--- old/src/mlib/tech.h 2016-04-10 15:15:39.000000000 +0430
+++ new/src/mlib/tech.h 2022-02-04 22:33:44.542891731 +0330
@@ -26,7 +26,7 @@
// Технические вещи
//
#include <boost/current_function.hpp> // для BOOST_CURRENT_FUNCTION
-#include <boost/detail/endian.hpp> // для BOOST_XXX_ENDIAN
+#include <boost/predef/other/endian.h> // BOOST_ENDIAN_*_BYTE
#include <boost/version.hpp> // для BOOST_MINOR_VERSION
// для С-шного кода в С++
@@ -78,9 +78,9 @@
long line, const char* function);
// endianness
-#if defined(BOOST_BIG_ENDIAN)
+#if defined(BOOST_ENDIAN_BIG_BYTE)
# define HAS_BIG_ENDIAN
-#elif defined(BOOST_LITTLE_ENDIAN)
+#elif defined(BOOST_ENDIAN_LITTLE_BYTE)
# define HAS_LITTLE_ENDIAN
#else
# error mlib/tech.h: unknown endianness (legacy PDP arch?)
|