Commit c9bca63b by Francois Gygi

added cstring header for memcpy. Added ifdef for Xerces 3.0.1


git-svn-id: http://qboxcode.org/svn/qb/trunk@750 cba15fb0-1239-40c8-b417-11db7ca47a34
parent 84a119b8
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
// WavefunctionHandler.C // WavefunctionHandler.C
// //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// $Id: WavefunctionHandler.C,v 1.20 2009-04-30 22:39:18 fgygi Exp $ // $Id: WavefunctionHandler.C,v 1.21 2009-11-30 02:47:04 fgygi Exp $
#if USE_XERCES #if USE_XERCES
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
using namespace xercesc; using namespace xercesc;
#include <iostream> #include <iostream>
#include <cassert> #include <cassert>
#include <cstring> // memcpy
#include <sstream> #include <sstream>
using namespace std; using namespace std;
...@@ -404,7 +405,12 @@ void WavefunctionHandler::endElement(const XMLCh* const uri, ...@@ -404,7 +405,12 @@ void WavefunctionHandler::endElement(const XMLCh* const uri,
{ {
// base64 encoding // base64 encoding
unsigned int length; unsigned int length;
#ifdef XERCESC_3_0_1
XMLByte* b = Base64::decode((XMLByte*)content.c_str(),
(XMLSize_t*) &length);
#else
XMLByte* b = Base64::decode((XMLByte*)content.c_str(), &length); XMLByte* b = Base64::decode((XMLByte*)content.c_str(), &length);
#endif
assert(b!=0); assert(b!=0);
// use data in b // use data in b
assert(length/sizeof(double)==wftmpr_size); assert(length/sizeof(double)==wftmpr_size);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment