You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mc...@apache.org on 2013/08/14 13:31:57 UTC
svn commit: r1513818 - in /qpid/trunk/qpid/cpp/include/qpid:
swig_perl_typemaps.i swig_python_typemaps.i swig_ruby_typemaps.i
Author: mcpierce
Date: Wed Aug 14 11:31:56 2013
New Revision: 1513818
URL: http://svn.apache.org/r1513818
Log:
Revert "QPID-5067: Changed language bindings to use UTF-8 encoding on strings."
This reverts commit e9abca572cf1845bd3ad25238e3edbeef10e61a6.
Modified:
qpid/trunk/qpid/cpp/include/qpid/swig_perl_typemaps.i
qpid/trunk/qpid/cpp/include/qpid/swig_python_typemaps.i
qpid/trunk/qpid/cpp/include/qpid/swig_ruby_typemaps.i
Modified: qpid/trunk/qpid/cpp/include/qpid/swig_perl_typemaps.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/swig_perl_typemaps.i?rev=1513818&r1=1513817&r2=1513818&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/swig_perl_typemaps.i (original)
+++ qpid/trunk/qpid/cpp/include/qpid/swig_perl_typemaps.i Wed Aug 14 11:31:56 2013
@@ -51,9 +51,9 @@
STRLEN len;
char *ptr = SvPV(value, len);
qpid::types::Variant v = qpid::types::Variant(std::string(ptr,len));
- // if (SvUTF8(value)) {
- v.setEncoding("utf8");
- // }
+ if (SvUTF8(value)) {
+ v.setEncoding("utf8");
+ }
return v;
}
}
@@ -103,9 +103,9 @@
case qpid::types::VAR_STRING : {
const std::string val(v->asString());
result = newSVpvn(val.c_str(), val.size());
- // if( v->getEncoding() == "utf8" ) {
- SvUTF8_on(result);
- // }
+ if( v->getEncoding() == "utf8" ) {
+ SvUTF8_on(result);
+ }
break;
}
case qpid::types::VAR_MAP : {
Modified: qpid/trunk/qpid/cpp/include/qpid/swig_python_typemaps.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/swig_python_typemaps.i?rev=1513818&r1=1513817&r2=1513818&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/swig_python_typemaps.i (original)
+++ qpid/trunk/qpid/cpp/include/qpid/swig_python_typemaps.i Wed Aug 14 11:31:56 2013
@@ -60,11 +60,7 @@ typedef int Py_ssize_t;
if (PyFloat_Check(value)) return qpid::types::Variant(PyFloat_AS_DOUBLE(value));
if (PyInt_Check(value)) return qpid::types::Variant(int64_t(PyInt_AS_LONG(value)));
if (PyLong_Check(value)) return qpid::types::Variant(int64_t(PyLong_AsLongLong(value)));
- if (PyString_Check(value)) {
- qpid::types::Variant v = qpid::types::Variant(std::string(PyString_AS_STRING(value)));
- v.setEncoding("utf8");
- return v;
- }
+ if (PyString_Check(value)) return qpid::types::Variant(std::string(PyString_AS_STRING(value)));
if (PyDict_Check(value)) {
qpid::types::Variant::Map map;
PyToMap(value, &map);
Modified: qpid/trunk/qpid/cpp/include/qpid/swig_ruby_typemaps.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/swig_ruby_typemaps.i?rev=1513818&r1=1513817&r2=1513818&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/swig_ruby_typemaps.i (original)
+++ qpid/trunk/qpid/cpp/include/qpid/swig_ruby_typemaps.i Wed Aug 14 11:31:56 2013
@@ -27,16 +27,9 @@
void RbToList(VALUE, qpid::types::Variant::List*);
qpid::types::Variant RbToVariant(VALUE value) {
- printf("RbToVariant is of type %d\n", TYPE(value));
switch (TYPE(value)) {
case T_FLOAT: return qpid::types::Variant(NUM2DBL(value));
- case T_STRING: {
- qpid::types::Variant v = qpid::types::Variant();
- v = StringValuePtr(value));
- v.setEncoding("utf8");
- return v;
- }
- break;
+ case T_STRING: return qpid::types::Variant(StringValuePtr(value));
case T_FIXNUM: return qpid::types::Variant((int64_t) FIX2LONG(value));
case T_BIGNUM: return qpid::types::Variant((int64_t) NUM2LL(value));
case T_TRUE: return qpid::types::Variant(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org