jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for "long long" in JSON Driver. 

* Bug: In Hurricane::JsonWriter, add support for "long long". Needed on
    32 bits architectures to write DbU that are now int64_t which
    resolves to "long long".
This commit is contained in:
Jean-Paul Chaput 2016-12-01 11:11:48 +01:00
parent 83382f252c
commit 10098e1371
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hurricane/src/hurricane/JsonWriter.cpp
View File

@ -90,6 +90,8 @@
void JsonWriter::write ( int v ) { _WRITER->Int ( v); }
void JsonWriter::write ( const long* v ) { _WRITER->Int64 (*v); }
void JsonWriter::write ( long v ) { _WRITER->Int64 ( v); }
void JsonWriter::write ( const long long* v ) { _WRITER->Int64 (*v); }
void JsonWriter::write ( long long v ) { _WRITER->Int64 ( v); }
void JsonWriter::write ( const unsigned int* v ) { _WRITER->Uint (*v); }
void JsonWriter::write ( unsigned int v ) { _WRITER->Uint ( v); }
void JsonWriter::write ( const unsigned long* v ) { _WRITER->Uint64(*v); }

6
hurricane/src/hurricane/hurricane/JsonWriter.h
View File

@ -86,6 +86,8 @@ namespace Hurricane {
void write ( int );
void write ( const int* );
void write ( long );
void write ( const long long* );
void write ( long long );
void write ( const long* );
void write ( unsigned int );
void write ( const unsigned int* );
@ -130,6 +132,8 @@ inline void jsonWrite ( JsonWriter* w, const int* v ) { w->write(v);
inline void jsonWrite ( JsonWriter* w, int v ) { w->write(v); }
inline void jsonWrite ( JsonWriter* w, const long* v ) { w->write(v); }
inline void jsonWrite ( JsonWriter* w, long v ) { w->write(v); }
inline void jsonWrite ( JsonWriter* w, const long long* v ) { w->write(v); }
inline void jsonWrite ( JsonWriter* w, long long v ) { w->write(v); }
inline void jsonWrite ( JsonWriter* w, const unsigned int* v ) { w->write(v); }
inline void jsonWrite ( JsonWriter* w, unsigned int v ) { w->write(v); }
inline void jsonWrite ( JsonWriter* w, const unsigned long* v ) { w->write(v); }
@ -213,7 +217,7 @@ template<typename C>
inline void jsonWrite ( JsonWriter* w, const std::string& key, const C& )
{
w->key( key );
std::string message = "JSON unsupported type " + Hurricane::demangle(typeid(C).name());
std::string message = "[DRIVER ERROR] JSON unsupported type " + Hurricane::demangle(typeid(C).name());
w->write( message.c_str() );
}