Skip to content

Commit 1466511

Browse files
committed
fix incorrectly rebased pugixml hpp file
1 parent 38678a4 commit 1466511

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

src/pugixml.hpp

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,21 @@
2121
#ifndef HEADER_PUGIXML_HPP
2222
#define HEADER_PUGIXML_HPP
2323

24+
#ifndef PUGIXML_EXPORT_MODULE
2425
// Include stddef.h for size_t and ptrdiff_t
25-
#include <stddef.h>
26+
# include <stddef.h>
2627

2728
// Include exception header for XPath
28-
#if !defined(PUGIXML_NO_XPATH) && !defined(PUGIXML_NO_EXCEPTIONS)
29-
# include <exception>
30-
#endif
29+
# if !defined(PUGIXML_NO_XPATH) && !defined(PUGIXML_NO_EXCEPTIONS)
30+
# include <exception>
31+
# endif
3132

3233
// Include STL headers
33-
#ifndef PUGIXML_NO_STL
34-
# include <iterator>
35-
# include <iosfwd>
36-
# include <string>
34+
# ifndef PUGIXML_NO_STL
35+
# include <iterator>
36+
# include <iosfwd>
37+
# include <string>
38+
# endif
3739
#endif
3840

3941
// Check if std::string_view is available
@@ -45,9 +47,11 @@
4547
# endif
4648
#endif
4749

50+
#ifndef PUGIXML_EXPORT_MODULE
4851
// Include string_view if appropriate
49-
#ifdef PUGIXML_HAS_STRING_VIEW
50-
# include <string_view>
52+
# ifdef PUGIXML_HAS_STRING_VIEW
53+
# include <string_view>
54+
# endif
5155
#endif
5256

5357
// Macro for deprecated features
@@ -164,6 +168,10 @@
164168
# define PUGIXML_CHAR char
165169
#endif
166170

171+
#ifndef PUGIXML_MODULE_EXPORT
172+
# define PUGIXML_MODULE_EXPORT
173+
#endif
174+
167175
namespace pugi
168176
{
169177
// Character type used for all internal storage and operations; depends on PUGIXML_WCHAR_MODE
@@ -181,7 +189,7 @@ namespace pugi
181189
}
182190

183191
// The PugiXML namespace
184-
namespace pugi
192+
PUGIXML_MODULE_EXPORT namespace pugi
185193
{
186194
// Tree node types
187195
enum xml_node_type

0 commit comments

Comments
 (0)