[pypy-commit] pypy cppyy-packaging: remove now superfluous LinkDef files (were for CINT; cling can use xml)

wlav pypy.commits at gmail.com
Thu Aug 3 20:16:28 EDT 2017


Author: Wim Lavrijsen <WLavrijsen at lbl.gov>
Branch: cppyy-packaging
Changeset: r92061:ad8862eba7b7
Date: 2017-08-03 15:08 -0700
http://bitbucket.org/pypy/pypy/changeset/ad8862eba7b7/

Log:	remove now superfluous LinkDef files (were for CINT; cling can use
	xml)

diff --git a/pypy/module/_cppyy/test/advancedcpp2_LinkDef.h b/pypy/module/_cppyy/test/advancedcpp2_LinkDef.h
deleted file mode 100644
--- a/pypy/module/_cppyy/test/advancedcpp2_LinkDef.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ namespace a_ns;
-#pragma link C++ namespace a_ns::d_ns;
-#pragma link C++ struct a_ns::g_class;
-#pragma link C++ struct a_ns::g_class::h_class;
-#pragma link C++ struct a_ns::d_ns::i_class;
-#pragma link C++ struct a_ns::d_ns::i_class::j_class;
-#pragma link C++ variable a_ns::g_g;
-#pragma link C++ function a_ns::get_g_g;
-#pragma link C++ variable a_ns::d_ns::g_i;
-#pragma link C++ function a_ns::d_ns::get_g_i;
-
-#endif
diff --git a/pypy/module/_cppyy/test/advancedcpp_LinkDef.h b/pypy/module/_cppyy/test/advancedcpp_LinkDef.h
deleted file mode 100644
--- a/pypy/module/_cppyy/test/advancedcpp_LinkDef.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ class short_defaulter;
-#pragma link C++ class ushort_defaulter;
-#pragma link C++ class int_defaulter;
-#pragma link C++ class uint_defaulter;
-#pragma link C++ class long_defaulter;
-#pragma link C++ class ulong_defaulter;
-#pragma link C++ class llong_defaulter;
-#pragma link C++ class ullong_defaulter;
-#pragma link C++ class float_defaulter;
-#pragma link C++ class double_defaulter;
-
-#pragma link C++ class base_class;
-#pragma link C++ class derived_class;
-
-#pragma link C++ class a_class;
-#pragma link C++ class b_class;
-#pragma link C++ class c_class;
-#pragma link C++ class c_class_1;
-#pragma link C++ class c_class_2;
-#pragma link C++ class d_class;
-
-#pragma link C++ function create_c1();
-#pragma link C++ function create_c2();
-
-#pragma link C++ function get_a(a_class&);
-#pragma link C++ function get_b(b_class&);
-#pragma link C++ function get_c(c_class&);
-#pragma link C++ function get_d(d_class&);
-
-#pragma link C++ class T1<int>;
-#pragma link C++ class T2<T1<int> >;
-#pragma link C++ class T3<int, double>;
-#pragma link C++ class T3<T1<int>, T2<T1<int> > >;
-#pragma link C++ class a_ns::T4<int>;
-#pragma link C++ class a_ns::T4<T3<int,double> >;
-#pragma link C++ class a_ns::T4<a_ns::T4<T3<int, double> > >;
-
-#pragma link C++ namespace a_ns;
-#pragma link C++ namespace a_ns::d_ns;
-#pragma link C++ struct a_ns::b_class;
-#pragma link C++ struct a_ns::b_class::c_class;
-#pragma link C++ struct a_ns::d_ns::e_class;
-#pragma link C++ struct a_ns::d_ns::e_class::f_class;
-#pragma link C++ variable a_ns::g_a;
-#pragma link C++ function a_ns::get_g_a;
-#pragma link C++ variable a_ns::d_ns::g_d;
-#pragma link C++ function a_ns::d_ns::get_g_d;
-
-#pragma link C++ class some_abstract_class;
-#pragma link C++ class some_concrete_class;
-#pragma link C++ class some_convertible;
-#pragma link C++ class some_class_with_data;
-#pragma link C++ class some_class_with_data::some_data;
-
-#pragma link C++ class some_comparable;
-#pragma link C++ function operator==(const some_comparable&, const some_comparable&);
-#pragma link C++ function operator!=(const some_comparable&, const some_comparable&);
-
-#pragma link C++ class ref_tester;
-#pragma link C++ class std::vector<ref_tester>;
-#pragma link C++ class pointer_pass;
-
-#pragma link C++ class multi1;
-#pragma link C++ class multi2;
-#pragma link C++ class multi;
-
-#pragma link C++ class new_overloader;
-
-#pragma link C++ class my_templated_class<std::vector<float> >;
-#pragma link C++ function my_templated_function<char>(char);
-#pragma link C++ function my_templated_function<double>(double);
-#pragma link C++ class my_templated_method_class;
-#pragma link C++ typedef my_typedef_t;
-
-#pragma link C++ class overload_one_way;
-#pragma link C++ class overload_the_other_way;
-
-#endif
diff --git a/pypy/module/_cppyy/test/crossing_LinkDef.h b/pypy/module/_cppyy/test/crossing_LinkDef.h
deleted file mode 100644
--- a/pypy/module/_cppyy/test/crossing_LinkDef.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ namespace crossing;
-
-#pragma link C++ class crossing::A;
-
-#endif
diff --git a/pypy/module/_cppyy/test/datatypes_LinkDef.h b/pypy/module/_cppyy/test/datatypes_LinkDef.h
deleted file mode 100644
--- a/pypy/module/_cppyy/test/datatypes_LinkDef.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ struct cppyy_test_pod;
-#pragma link C++ class cppyy_test_data;
-#pragma link C++ class four_vector;
-
-#pragma link C++ enum fruit;
-
-#pragma link C++ function get_pod_address(cppyy_test_data&);
-#pragma link C++ function get_int_address(cppyy_test_data&);
-#pragma link C++ function get_double_address(cppyy_test_data&);
-#pragma link C++ function set_global_int(int);
-#pragma link C++ function get_global_int();
-
-#pragma link C++ function is_global_pod(cppyy_test_pod*);
-#pragma link C++ function set_global_pod(cppyy_test_pod*);
-#pragma link C++ function get_global_pod();
-#pragma link C++ function get_null_pod();
-
-#pragma link C++ global N;
-#pragma link C++ global g_int;
-#pragma link C++ global g_pod;
-
-#endif
diff --git a/pypy/module/_cppyy/test/example01_LinkDef.h b/pypy/module/_cppyy/test/example01_LinkDef.h
deleted file mode 100644
--- a/pypy/module/_cppyy/test/example01_LinkDef.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ class example01;
-#pragma link C++ typedef example01_t;
-#pragma link C++ class example01a;
-#pragma link C++ class payload;
-#pragma link C++ class ArgPasser;
-#pragma link C++ class z_;
-
-#pragma link C++ function globalAddOneToInt(int);
-#pragma link C++ function installableAddOneToInt(example01&, int);
-
-#pragma link C++ namespace ns_example01;
-#pragma link C++ function ns_example01::globalAddOneToInt(int);
-
-#pragma link C++ variable ns_example01::gMyGlobalInt;
-
-#endif
diff --git a/pypy/module/_cppyy/test/fragile_LinkDef.h b/pypy/module/_cppyy/test/fragile_LinkDef.h
deleted file mode 100644
--- a/pypy/module/_cppyy/test/fragile_LinkDef.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ namespace fragile;
-#pragma link C++ namespace fragile::nested1;
-#pragma link C++ namespace fragile::nested1::nested2;
-#pragma link C++ namespace fragile::nested1::nested2::nested3;
-
-#pragma link C++ class fragile::A;
-#pragma link C++ class fragile::B;
-#pragma link C++ class fragile::C;
-#pragma link C++ class fragile::D;
-#pragma link C++ class fragile::E;
-#pragma link C++ class fragile::F;
-#pragma link C++ class fragile::G;
-#pragma link C++ class fragile::H;
-#pragma link C++ class fragile::I;
-#pragma link C++ class fragile::J;
-#pragma link C++ class fragile::K;
-#pragma link C++ class fragile::L;
-#pragma link C++ class fragile::M;
-#pragma link C++ class fragile::N;
-#pragma link C++ class fragile::O;
-#pragma link C++ class fragile::nested1::A;
-#pragma link C++ class fragile::nested1::nested2::A;
-#pragma link C++ class fragile::nested1::nested2::nested3::A;
-
-#pragma link C++ variable fragile::gI;
-
-#pragma link C++ function fragile::fglobal;
-
-#endif
diff --git a/pypy/module/_cppyy/test/iotypes_LinkDef.h b/pypy/module/_cppyy/test/iotypes_LinkDef.h
deleted file mode 100644
--- a/pypy/module/_cppyy/test/iotypes_LinkDef.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-using namespace std;
-#pragma link C++ class vector<vector<float> >+;
-#pragma link C++ class vector<vector<float> >::iterator;
-#pragma link C++ class vector<vector<float> >::const_iterator;
-
-#pragma link C++ namespace IO;
-#pragma link C++ class IO::SomeDataObject+;
-#pragma link C++ class IO::SomeDataStruct+;
-
-#endif
diff --git a/pypy/module/_cppyy/test/operators_LinkDef.h b/pypy/module/_cppyy/test/operators_LinkDef.h
deleted file mode 100644
--- a/pypy/module/_cppyy/test/operators_LinkDef.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ class number;
-
-#pragma link C++ struct operator_char_star;
-#pragma link C++ struct operator_const_char_star;
-#pragma link C++ struct operator_int;
-#pragma link C++ struct operator_long;
-#pragma link C++ struct operator_double;
-#pragma link C++ struct operator_short;
-#pragma link C++ struct operator_unsigned_int;
-#pragma link C++ struct operator_unsigned_long;
-#pragma link C++ struct operator_float;
-
-#pragma link C++ class v_opeq_base;
-#pragma link C++ class v_opeq_derived;
-
-#endif
diff --git a/pypy/module/_cppyy/test/overloads_LinkDef.h b/pypy/module/_cppyy/test/overloads_LinkDef.h
deleted file mode 100644
--- a/pypy/module/_cppyy/test/overloads_LinkDef.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ class a_overload;
-#pragma link C++ class b_overload;
-#pragma link C++ class c_overload;
-#pragma link C++ class d_overload;
-
-#pragma link C++ namespace ns_a_overload;
-#pragma link C++ class ns_a_overload::a_overload;
-#pragma link C++ class ns_a_overload::b_overload;
-
-#pragma link C++ class ns_b_overload;
-#pragma link C++ class ns_b_overload::a_overload;
-
-#pragma link C++ class aa_ol;
-#pragma link C++ class cc_ol;
-
-#pragma link C++ class more_overloads;
-#pragma link C++ class more_overloads2;
-
-#pragma link C++ function calc_mean;
-
-#endif
diff --git a/pypy/module/_cppyy/test/stltypes_LinkDef.h b/pypy/module/_cppyy/test/stltypes_LinkDef.h
deleted file mode 100644
--- a/pypy/module/_cppyy/test/stltypes_LinkDef.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ class std::vector<just_a_class>;
-#pragma link C++ class std::vector<just_a_class>::iterator;
-#pragma link C++ class std::vector<just_a_class>::const_iterator;
-
-#pragma link C++ class map<std::string, unsigned int>;
-#pragma link C++ class map<std::string, unsigned int>::iterator;
-#pragma link C++ class map<std::string, unsigned int>::const_iterator;
-#pragma link C++ class pair<std::string, unsigned int>;
-
-#pragma link C++ class map<std::string, unsigned long>;
-#pragma link C++ class map<std::string, unsigned long>::iterator;
-#pragma link C++ class map<std::string, unsigned long>::const_iterator;
-#pragma link C++ class pair<std::string, unsigned long>;
-
-#pragma link C++ class just_a_class;
-#pragma link C++ class stringy_class;
-#pragma link C++ class stl_like_class<int>;
-
-#endif


More information about the pypy-commit mailing list