Author: Wim Lavrijsen <[email protected]>
Branch: cppyy-packaging
Changeset: r92065:701628812c28
Date: 2017-08-03 16:43 -0700
http://bitbucket.org/pypy/pypy/changeset/701628812c28/
Log: remove spurious references to CINT
diff --git a/pypy/module/_cppyy/converter.py b/pypy/module/_cppyy/converter.py
--- a/pypy/module/_cppyy/converter.py
+++ b/pypy/module/_cppyy/converter.py
@@ -867,27 +867,3 @@
for c_type, alias in aliases:
_converters[alias] = _converters[c_type]
_add_aliased_converters()
-
-# ROOT-specific converters (TODO: this is a general use case and should grow
-# an API; putting it here is done only to circumvent circular imports)
-if capi.identify() == "CINT":
-
- class TStringConverter(InstanceConverter):
- def __init__(self, space, extra):
- from pypy.module._cppyy import interp_cppyy
- cppclass = interp_cppyy.scope_byname(space, "TString")
- InstanceConverter.__init__(self, space, cppclass)
-
- def _unwrap_object(self, space, w_obj):
- from pypy.module._cppyy import interp_cppyy
- if isinstance(w_obj, interp_cppyy.W_CPPInstance):
- arg = InstanceConverter._unwrap_object(self, space, w_obj)
- return capi.backend.c_TString2TString(space, arg)
- else:
- return capi.backend.c_charp2TString(space, space.text_w(w_obj))
-
- def free_argument(self, space, arg, call_local):
- capi.c_destruct(space, self.cppclass, rffi.cast(capi.C_OBJECT,
rffi.cast(rffi.VOIDPP, arg)[0]))
-
- _converters["TString"] = TStringConverter
- _converters["const TString&"] = TStringConverter
diff --git a/pypy/module/_cppyy/test/advancedcpp.h
b/pypy/module/_cppyy/test/advancedcpp.h
--- a/pypy/module/_cppyy/test/advancedcpp.h
+++ b/pypy/module/_cppyy/test/advancedcpp.h
@@ -246,9 +246,7 @@
int m_i;
};
-#ifndef __CINT__
template class std::vector<ref_tester>;
-#endif
//===========================================================================
diff --git a/pypy/module/_cppyy/test/datatypes.h
b/pypy/module/_cppyy/test/datatypes.h
--- a/pypy/module/_cppyy/test/datatypes.h
+++ b/pypy/module/_cppyy/test/datatypes.h
@@ -1,5 +1,5 @@
// copied from RtypesCore.h ...
-#if defined(R__WIN32) && !defined(__CINT__)
+#if defined(R__WIN32)
typedef __int64 Long64_t; //Portable signed long integer 8 bytes
typedef unsigned __int64 ULong64_t; //Portable unsigned long integer 8 bytes
#else
diff --git a/pypy/module/_cppyy/test/stltypes.h
b/pypy/module/_cppyy/test/stltypes.h
--- a/pypy/module/_cppyy/test/stltypes.h
+++ b/pypy/module/_cppyy/test/stltypes.h
@@ -74,9 +74,7 @@
struct _CppyyMapInstances {
-#ifndef __CINT__
STLTYPE_INSTANTIATION2(map, int, int, 1);
-#endif
STLTYPE_INSTANTIATION2(map, std::string, int, 2);
STLTYPE_INSTANTIATION2(map, std::string, unsigned int, 3);
STLTYPE_INSTANTIATION2(map, std::string, unsigned long, 4);
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
