summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarseny.kapoulkine@gmail.com <arseny.kapoulkine@gmail.com@99668b35-9821-0410-8761-19e4c4f06640>2012-03-20 04:00:10 +0000
committerarseny.kapoulkine@gmail.com <arseny.kapoulkine@gmail.com@99668b35-9821-0410-8761-19e4c4f06640>2012-03-20 04:00:10 +0000
commit07cda98d6614aca17f02083fd68c3783fa9e9a1d (patch)
tree4f3c0a772f926a81ff1eff4916c21e3fea7d2e7b
parent81e248b3b69d3fee13487b456465ba83abf15532 (diff)
Fixed Borland C++ issues when compiling pugixml as header-only
git-svn-id: http://pugixml.googlecode.com/svn/trunk@864 99668b35-9821-0410-8761-19e4c4f06640
-rw-r--r--src/pugixml.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index cd42544..5193e68 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -56,6 +56,10 @@
# pragma warning(disable: 1684) // conversion from pointer to same-sized integral type
#endif
+#if defined(__BORLANDC__) && defined(PUGIXML_HEADER_ONLY)
+# pragma warn -8080 // symbol is declared but never used; disabling this inside push/pop bracket does not make the warning go away
+#endif
+
#ifdef __BORLANDC__
# pragma option push
# pragma warn -8008 // condition is always false
@@ -87,6 +91,12 @@
# define PUGI__DMC_VOLATILE
#endif
+// Borland C++ bug workaround for not defining ::memcpy depending on header include order (can't always use std::memcpy because some compilers don't have it at all)
+#if defined(__BORLANDC__) && !defined(__MEM_H_USING_LIST)
+using std::memcpy;
+using std::memmove;
+#endif
+
// In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features
#if defined(_MSC_VER) && !defined(__S3E__)
# define PUGI__MSVC_CRT_VERSION _MSC_VER