ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/root_Reflex_Cintex.patch
Revision: 1.2
Committed: Wed Oct 10 22:06:06 2007 UTC (17 years, 6 months ago) by dlange
Branch: MAIN
CVS Tags: forFrontend-3, webconddb173, condapp173, webconddb172, condapp172, webconddb171, condapp171, webconddb170, condapp170, condapp164b, webconddb164b, webconddb164, conapp164, zx20090506, forPHEDEX-web-services-20090423, forPHEDEX-web-services-20090406, forPHEDEX313a, zx20090224, zx20090219, forPHEDEX313, zx20090217, zx20090216, forPHEDEX-web-services-20090216, forPHEDEX312, sw_20090115, zx20090115, zx20090114, WEBTOOLS-APPS_20090113, DBS-APPS_20090109, DBS-APPS_20090108, sw_20090108, WEBTOOLS-APPS_20090108, DBS-APPS_20090106, DBS-APPS_20090105, FMWS_20090103, FMWS_20081224_1, FMWS_20081224, FMWS_20081222_3, FMWS_20081222_2, FMWS_20081222, DBS-APPS_20081218, FMWS_20081212_1, FMWS_20081212, FMWS_20081211, DBS-APPS_20081211, forPHEDEX311, DBS-APPS_20081210, forPHEDEX310, DBS-APPS_20081209, WEBTOOLS-APPS_20081208, forPHEDEX310pre2, DBS-APPS_20081205, forPHEDEX-web-services-20081205, DBS-APPS_20081204, DBS-APPS_200811204, forPHEDEX310pre1, DBS-APPS_20081126_1, DBS-APPS_20081126, DBS-APPS_20081125, ofctest, DBS-APPS_20081119, DBS-APPS_20081118, DBS-APPS_20081117, DBS-APPS_20081114_1, DBS-APPS_20081114, DBS-APPS_20081112, DBS-APPS_20081111_1, DBS-APPS_20081110_2, DBS-APPS_20081110_1, WEBTOOLS-APPS_20081110, DBS-APPS_20081110, WEBTOOLS-APPS_20081107_1, WEBTOOLS-APPS_20081107, DBS-APPS_20081107, DBS-APPS_20081105, DBS-APPS_20081104, WEBTOOLS-APPS_20081031_2, DBS-APPS_20081031_2, DBS-APPS_20081031_1, WEBTOOLS-APPS_20081031_1, WEBTOOLS-APPS_20081031, forPHEDEX307, DBS-APPS_20081024, WEBTOOLS-APPS_20081020_1, WEBTOOLS-APPS_20081020, forFrontend-2, WEBTOOLS-APPS_20081016_2, WEBTOOLS-APPS_20081016_1, WEBTOOLS-APPS_20081016, WEBTOOLS-APPS_20081015, WEBTOOLS-APPS_20081013_1, WEBTOOLS-APPS_20081013, WEBTOOLS-APPS_20081009, WEBTOOLS-APPS_20081008_1, WEBTOOLS-APPS_20081008, forPHEDEX-web-services-20081008, forPHEDEX-web-services-20081007, forPHEDEX-web302_test1, forPHEDEX306, forPHEDEX-datasvc120_test1, WEBTOOLS-APPS_20080922, forFrontend-1, WEBTOOLS-APPS_20080917, WEBTOOLS-APPS_20080916, WEBTOOLS-APPS_20080915, forPHEDEX305, DBS-APPS_20080910_1, WEBTOOLS-APPS_20080910_1, WEBTOOLS-APPS_20080910, DBS-APPS_20080910, WEBTOOLS-APPS_20080909, DBS-APPS_20080908, WEBTOOLS-APPS_20080903, WEBTOOLS-APPS_20080826, zx20080825, WEBTOOLS-APPS_20080822, WEBTOOLS-APPS_20080821, WEBTOOLS-APPS_20080818_1, WEBTOOLS-APPS_20080818, forPHEDEX-web301, WEBTOOLS-APPS_20080725, WEBTOOLS-APPS_20080724, re-deps-20080722, zx20080718, WEBTOOLS-APPS_20080717, WEBTOOLS-APPS_20080716, WEBTOOLS-APPS_20080715_2, WEBTOOLS-APPS_20080715_1, WEBTOOLS-APPS_20080715, zx20080715, WEBTOOLS-APPS_20080713, forPHEDEX304, zx20080707, forPHEDEX-datasvc110, forPHEDEX-web300, forPHEDEX-web110, re20080627, zx20080625, WEBTOOLS-APPS_20080624, WEBTOOLS-APPS_20080619_1, WEBTOOLS-APPS_20080619, WEBTOOLS-APPS_20080617, zx20080611, WEBTOOLS-APPS_20080611, zx20080610, WEBTOOLS-APPS_20080609_1, WEBTOOLS-APPS_20080609, zx20080609, sw_20080509, WEBTOOLS-APPS_20080527_2, WEBTOOLS-APPS_20080527, WEBTOOLS-APPS_20080523, WEBTOOLS-APPS_20080522, WEBTOOLS-APPS_20080521, WEBTOOLS-APPS_20080520, WEBTOOLS-APPS_20080519, zx20080519, WEBTOOLS-APPS_20080511, zx20080509b, WEBTOOLS-APPS_20080507_1, WEBTOOLS-APPS_20080507, WEBTOOLS-APPS_20080506, WEBTOOLS-APPS_20080501, zx20080430, CMSSW_2_0_0_ONLINE2, nrnr080424for200onl2, nr080326fwl200p7, WEBTOOLS-APPS_20080422, apFor210p3v1, apFor210p3v0, CMSSW_2_0_1, dl080418, CMSSW_2_1_0_pre2, WEBTOOLS-APPS_20080416, CMSSW_2_0_0_ONLINE1, apFor210p2v2, dl080415t2, dl080415, apFor210p2v1, apFor210p2v0, zx20080415-comp, webconddb_1_1_1, WEBTOOLS-APPS_20080414, nr080413, WEBTOOLS-APPS_20080412, WEBTOOLS-APPS_20080411_1, WEBTOOLS-APPS_20080411, CMSSW_2_0_0, WEBTOOLS-APPS_20080410, WEBTOOLS-APPS_20080409_1, WEBTOOLS-APPS_20080409, dl080408cand200t1, dl080408t1, WEBTOOLS-APPS_20080408_1, WEBTOOLS-APPS_20080408, nr080408for200p9, dl080407t3, dl080407t2, CMSSW_2_1_0_pre1, DBS-APPS_20080407, CMSSW_2_0_0_pre7_ONLINE1, WEBTOOLS-APPS_20080407, dl080407, apFor210p1, CMSSW_2_0_0_pre9, dl080405, CMSSW_1_8_4, pe20080405-for184, WEBTOOLS-APPS_20080404_2, WEBTOOLS-APPS_20080404_1, WEBTOOLS-APPS_20080404, WEBTOOLS-APPS_20080403_4, WEBTOOLS-APPS_20080403_3, WEBTOOLS-APPS_20080403_2, WEBTOOLS-APPS_20080403_1, WEBTOOLS-APPS_20080403, nr080331for200p7onl1, CMSSW_2_0_0_pre8, sm080328a, WEBTOOLS-APPS_20080328, WEBTOOLS-APPS_20080327_1, WEBTOOLS-APPS_20080327, CMSSW_1_8_3, CMSSW_2_0_0_pre7, WEBTOOLS-APPS_20080326_6, WEBTOOLS-APPS_20080326_5, WEBTOOLS-APPS_20080326_4, WEBTOOLS-APPS_20080326_3, WEBTOOLS-APPS_20080326_2, WEBTOOLS-APPS_20080326, DBSweb_260308_1, pe20080326-for183, DBSweb_260308, pe20080325-for183, CMSSW_1_8_2, pe20080324-for182, CMSSW_2_0_0_pre6, CMSSW_1_7_7, forPHEDEX262_cmsbuild3, sw_20080319, sw20080319, DBSweb_180308_2, DBSweb_180308_1, DBSweb_180308, DBSweb_170308_8, DBSweb_170308_7, DBSweb_170308_6, DBSweb_170308_5, DBSweb_170308_4, DBSweb_170308_3, DBSweb_170308_2, DBSweb_170308, SiteDB_170308, CMSSW_2_0_0_pre5, SiteDB_1_2_1-160308_2, SiteDB_1_2_1-160308, SM_150308_DBSDisc_9, SM_150308_DBSDisc_8, SM_150308_DBSDisc_7, SM_150308_DBSDisc_6, SM_150308_DBSDisc_5, SM_150308_DBSDisc_4, SM_150308_DBSDisc_3, SM_150308_DBSDisc_2, SM_150308_DBSDisc_1, SM_150308_DBSDisc, CMSSW_1_8_1, nr080314_181onl1, pe20080314-for181, SiteDB_140308, SiteDB_130308, CMSSW_2_0_0_pre4, dl080312, CMSSW_1_8_0_ONLINE1, nr080310_180onl1, dl080308, dl080307cmsswtoolconf2cms5, dl080307, dl080307cmsswtoolconf2cms4, nr080307onl180onl1, CMSSW_1_8_0, dl080304t4, dl080304t3, dl080304t2, dl080304, pe20080304a-for180, ge20080304-comp, pe20080303a-for18X, dl080229, CMSSW_1_8_0_pre10, pe20080229-ports, dl080228t2, dl080228, CMSSW_2_0_0_pre3, dl080227for176, SiteDB_080227, dl080227, ge20080226, dl080226t2, dl080226, pe20080226-for180p10, dl080225intbld, ge20080225-nightlies, ge20080225-fixed-bootstrap, dl080224t3, dl080224t2, dl080224, dl080223, dl080222, dl080221, CMSSW_1_7_5_ONLINE1, pe20080221a-ports-412, pe20080221a-ports, dl080220, pe20080220a-for18X, pe20080220a-ports-412, pe20080220a-ports, CMSSW_1_8_0_pre9, sm080219, ge20080219, dl080218, nr080215g491p01dbg, COMP_NIGHTLY_INIT_V1, SiteDB_SM_Nightly_150208, ge20080215, pe20080214a-ports-for190p9-412, pe20080214a-ports-for190p9, pe20080211a-ports-for190p9-412, pe20080211a-ports-for190p9, COMP_NIGHTLY_20080211, CMSSW_2_0_0_pre1, pe20080207c-ports-for190p8-412, pe20080207c-ports-for190p8, pe20080207b-ports-lcg54pre2-412, pe20080207b-ports-lcg54pre2, pe20080207a-ports-lcg54pre2-412, pe20080207a-ports-lcg54pre2, pe20080206b-ports-lcg54pre2-412, pe20080206b-ports-lcg54pre2, pe20080206a-ports-lcg54pre2-412, pe20080206a-ports-lcg54pre2, pe20080205c-ports-lcg54pre2-412, pe20080205c-ports-lcg54pre2, pe20080205b-ports-lcg54pre2-412, pe20080205b-ports-lcg54pre2, pe20080205a-ports-lcg54pre2-412, pe20080205a-ports-lcg54pre2, CMSSW_1_8_0_pre8, pe20080204a-ports-lcg54pre2-412, pe20080204a-ports-lcg54pre2, dl080202, pe20080127a-ports-lcg54pre2-412, pe20080127a-ports-lcg54pre2, pe20080126-for180p8, pe20080125a-ports-lcg54pre2-412, pe20080125a-ports-lcg54pre2, pe20080125a-ports-lcg54-412, pe20080125a-ports-lcg54, pe20080123a-ports-412, pe20080123a-ports, CMSSW_1_8_0_pre7, pe20080122a-for180p7, dl080120, pe20080120a-ports-412, pe20080120a-ports, pe20080120a-for180p7, pe20080119a-ports-412, pe20080119a-ports, pe20080118g-ports-412, pe20080118g-ports, pe20080118f-ports-412, pe20080118f-ports, nr_pe20080118e-ports-onl, pe20080118e-ports-412, pe20080118e-ports, pe20080118d-ports-412, pe20080118d-ports, pe20080118c-ports, pe20080118b-ports, pe20080118a-ports, pe20080117b-for180p7, CMSSW_1_7_5, CMSSW_1_7_5_g491, pe20080117-for180p7, CMSSW_1_7_5_ONLINE, nr080115onl175, dl080115, dl080111, pe20080111b-ports, CMSSW_1_8_0_pre6, pe20080111a-ports, pe20080110b-ports, pe20080110a-ports, pe20080109a-ports, ge20080109-webconddb, ge20080109-sitedb, NR080108_geant491-dbg-global, pe20080108c-ports, ge20080108-wt, pe20080108b-ports, pe20080108a-ports, pe20080105a-ports, pe20080104a-ports, pe20080103a-ports-gcc422, pe20080103a-ports, pe20070103a-ports, pe20080101a-ports, sm20080101a-newscram, pe20071128b-ports, pe20071128a-ports, pe20071127b-ports, pe20071127-ports, pe20071226c-for180p6, pe20071226b-for180p6, pe20071226a-for180p6, ge20071224, ge20071223, ge20071221, pe20071220b-for180p6, ge20071220, pe20071220-for180p6, CMSSW_1_7_4, ge20071217, CMSSW_1_8_0_pre5, pe20071216-for180p5, ge20071216, CMSSW_1_7_3_g490p1, CMSSW_1_8_0_pre4-vg330, ge20071213, dl071212t2, dl071212, ge20071212-perfreport, ge20071212, ge20071211, CMSSW_1_7_3, ge20071210a, ge20071210, CMSSW_1_7_2, pe20071207-for180p4g491c3, NR071206_geant491cand3-global, ge20071207, pe20071206-for180test1, CMSSW_1_8_0_pre4-412, CMSSW_1_8_0_pre4, pe20071205b-for180p4-412, pe20071205b-for180p4, pe20071205-for180p4, ge20071205, CMSSW_1_8_0_pre3a-412, ge20071203, pe20071202-for180p3a-gcc412, CMSSW_1_8_0_pre3a, pe20071201b-for180p3a, pe20071201-for180p3a, CMSSW_1_7_1, V00-06-08, ge20071128, pe20071130-for180p3, pe20071129-for180p3, ge20071127a-leopard, ge20071127-leopard, pe20071127a-ports-412, ge20071126-new-bootstrap, CMSSW_1_8_0_pre2, CMSSW_1_8_0_pre0-amd64, CMSSW_1_8_0_pre0, pe20071123e-ports-412, pe20071123d-ports-412, pe20071123c-ports-422, pe20071123c-ports-412, pe20071123c-ports, pe20071123b-ports-422, pe20071123b-ports-412, pe20071123b-ports, pe20071123a-ports-422, pe20071123a-ports-412, pe20071123a-ports, ge20071122-new-bootstrap, nr071121onl170_xdaq5, pe20071121a-ports-422, pe20071121a-ports-412, pe20071121a-ports, nr071120_fwlite170_1, CMSSW_1_7_0_ONLINE, CMSSW_1_7_0, nr071116onlpre13, CMSSW_1_7_0_pre13, dl071114, ap20071113, pe20071112c-ports-422, pe20071112c-ports-412, pe20071112c-ports, pe20071112b-ports-412, pe20071112b-ports, pe20071112a-ports, CMSSW_1_7_0_pre12, CMSSW_1_7_0_pre10_ONLINE, CMSSW_1_7_0_pre11, nr071105a, pe20071105c-ports, pe20071105b-ports, pe20071105a-ports, pe20071103e-ports, pe20071103d-ports, pe20071103c-ports, pe20071103b-ports, pe20071103a-ports, pe20071102b-ports, pe20071102a-ports, CMSSW_1_7_0_pre10, CMSSW_1_7_0_pre9, CMSSW_1_7_0_pre8, CMSSW_1_7_0_pre7, dl071028, dl071024, nr071023_fwlite170p6, pe20071023-170p6-amd64, forTony_001, pe20071021-170p6-zlib, dl071021t2, dl071021, pe20071021a-ports, dl071020, CMSSW_1_7_0_pre6, pe20071015-xrootd, pe20071014-ports, dl071014
Branch point for: conddb-branch
Changes since 1.1: +10 -10 lines
Log Message: 
fix my last root patch

File Contents

# User Rev Content
1 dlange 1.1 diff -u -r1.19.2.1 CINTClassBuilder.cxx
2 dlange 1.2 --- cintex/src/CINTClassBuilder.cxx 13 Feb 2007 15:11:09 -0000 1.19.2.1
3     +++ cintex/src/CINTClassBuilder.cxx 27 Sep 2007 21:59:07 -0000
4 dlange 1.1 @@ -288,7 +288,7 @@
5     Type btype = base.ToType();
6     CINTScopeBuilder::Setup(btype);
7     std::string b_nam = CintName(btype);
8     - int b_tagnum = CintTag(b_nam);
9     + int b_tagnum = G__search_tagname(b_nam.c_str(), 'a');
10     // Get the Offset. Treat differently virtual and non-virtual inheritance
11     size_t offset;
12     long int type = (level == 0) ? G__ISDIRECTINHERIT : 0;
13     diff -u -r1.8.6.2 CINTScopeBuilder.cxx
14 dlange 1.2 --- cintex/src/CINTScopeBuilder.cxx 28 Mar 2007 10:41:34 -0000 1.8.6.2
15     +++ cintex/src/CINTScopeBuilder.cxx 27 Sep 2007 21:59:07 -0000
16 dlange 1.1 @@ -45,7 +45,7 @@
17     if ( sname.find('<') != string::npos )
18     taginfo.tagtype = 'c'; // Is a templated class
19     else
20     - taginfo.tagtype = 'n'; // Undefined. Assume namespace
21     + taginfo.tagtype = 'a'; // Undefined. Do not assume namespace
22     }
23     taginfo.tagname = sname.c_str();
24     int tagnum = G__defined_tagname(taginfo.tagname, 2);
25     diff -u -r1.11.2.2 test_PyCintex_basics.py
26 dlange 1.2 --- cintex/test/test_PyCintex_basics.py 15 Mar 2007 08:51:22 -0000 1.11.2.2
27     +++ cintex/test/test_PyCintex_basics.py 27 Sep 2007 21:59:07 -0000
28 dlange 1.1 @@ -450,6 +450,11 @@
29     v[2] = p[2]
30     self.failUnlessEqual(v[2], p[2])
31    
32     + def test32CannotfindShowMembers(self) :
33     + obj = self.gbl.TrackingRecHit()
34     + self.failUnless(self)
35     + self.failUnless(hasattr(obj,'ShowMembers'))
36     +
37     suite = unittest.makeSuite(BasicsTestCase,'test')
38     if __name__ == '__main__':
39     ret = unittest.TextTestRunner( sys.stdout, verbosity = 2 ).run(suite)
40     diff -u -r1.15.2.2 CintexTest.h
41 dlange 1.2 --- cintex/test/dict/CintexTest.h 15 Mar 2007 08:51:22 -0000 1.15.2.2
42     +++ cintex/test/dict/CintexTest.h 27 Sep 2007 21:59:07 -0000
43 dlange 1.1 @@ -778,4 +778,15 @@
44     return 2;
45     }
46     };
47     -}
48     \ No newline at end of file
49     +}
50     +
51     +//----Bug https://savannah.cern.ch/bugs/?24227 -----------------
52     +class TrackingRecHit {
53     +public:
54     + class Type {};
55     +};
56     +
57     +class InvalidTrackingRecHit : public TrackingRecHit {
58     +public:
59     + typedef TrackingRecHit::Type Type;
60     +};
61     diff -u -r1.10.6.2 selection.xml
62 dlange 1.2 --- cintex/test/dict/selection.xml 15 Mar 2007 08:51:22 -0000 1.10.6.2
63     +++ cintex/test/dict/selection.xml 27 Sep 2007 21:59:07 -0000
64 dlange 1.1 @@ -68,6 +68,8 @@
65    
66     <function pattern="*theFunction*" />
67     <class name="MarcoCl::MyClass" />
68     + <class name="TrackingRecHit" />
69     + <class name="InvalidTrackingRecHit" />
70    
71     <exclusion>
72     <class name="A::B::C::MyClass::InnerClass"/>