summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2011-10-08 04:14:12 +0000
committerarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2011-10-08 04:14:12 +0000
commit696a0ea588fd632d006e60c043a9498441b46347 (patch)
tree9dd1a35f3b7ebb535580153ac029b35c77b64751
parentcf85e59f12c68bca3ca1c20eb6a8d91d8ad0bd4e (diff)
Fixed 'conversion from pointer to same-sized integral type' warning for Intel C++ compiler in case anyone compiles with -Wp64
git-svn-id: http://pugixml.googlecode.com/svn/trunk@822 99668b35-9821-0410-8761-19e4c4f06640
-rw-r--r--src/pugixml.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index 69e1b55..3680fc5 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -47,6 +47,7 @@
# pragma warning(disable: 177) // function was declared but never referenced
# pragma warning(disable: 279) // controlling expression is constant
# pragma warning(disable: 1478 1786) // function was declared "deprecated"
+# pragma warning(disable: 1684) // conversion from pointer to same-sized integral type
#endif
#ifdef __BORLANDC__