From: <baz...@us...> - 2008-02-27 14:57:22
|
Revision: 8162 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8162&view=rev Author: bazaarmagetron Date: 2008-02-27 06:57:09 -0800 (Wed, 27 Feb 2008) Log Message: ----------- Manuel Moos: Fixed compilation. Modified Paths: -------------- clio/trunk/clio/clio/dataconversion.hpp Property Changed: ---------------- clio/trunk/clio/ Property changes on: clio/trunk/clio ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-27 15:44:23.707000017 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: src + timestamp: 2008-02-27 15:51:30.835999966 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: src Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 4 z-...@us...-20080222202821-mkuiwckx41jof2gj 5 z-...@us...-20080222202957-htiysaaxkiroqd7e 6 z-...@us...-20080222211806-jc50b77qlgn2dp8j 7 z-...@us...-20080222215601-p8y78c77ncvq5eb1 8 z-...@us...-20080222223809-mmh9wh6yzrdm7oa1 9 z-...@us...-20080222232123-uhnuqd9db0p27rkf 10 z-...@us...-20080222232154-k64q4ee9zuq5r2jp 11 z-...@us...-20080222234236-ny0hc8lwybz73rv6 12 z-...@us...-20080223000039-566psft2c96236kw 13 z-...@us...-20080223000530-4mtket15l6oeo1ju 14 z-...@us...-20080223001030-5t86d3u3bidpoq6r 15 z-...@us...-20080223002857-qvx8z72tmsoguku0 16 z-...@us...-20080223004917-abqn3vdfqb1euyzc 17 z-...@us...-20080223010025-h0nul9yntjvutdbq 18 z-...@us...-20080223013357-1nzhrjwjr4g0h7g9 19 z-...@us...-20080223015240-btmt95d1vvlip4gl 20 z-...@us...-20080223124731-dlwuagon76gq2o3g 21 z-...@us...-20080223133015-0hjqyrki59ydwdcv 22 z-...@us...-20080223135113-icwd4g99yev9n0u2 23 z-...@us...-20080223152916-8rm942q1rmjlueca 24 z-...@us...-20080223174524-3lb2wm6tt5nytd4b 25 z-...@us...-20080223174610-gwmr3fn8456rwvmg 26 z-...@us...-20080223183115-ub0hshkf3zfs69ko 27 z-...@us...-20080223185539-cvhsltp2u12d5lgc 28 z-...@us...-20080223211352-km18u9bp9qhufyta 29 z-...@us...-20080223225132-94n2bwt307fujbg4 30 z-...@us...-20080223234541-mqp3d64uyn3no98y 31 z-...@us...-20080223235231-5lshcanhqlkwv36n 32 z-...@us...-20080224001425-n6xziwrp0hh3nz2f 33 z-...@us...-20080224161454-lyyn0grllfn5qx8w 34 z-...@us...-20080224180639-fr6dqfch7kboocs0 35 z-...@us...-20080224181843-8iq9zyjoz4dprm8b 36 z-...@us...-20080224224147-cmxp11hux8yn3jbp 37 z-...@us...-20080224224848-0h65c9bpg637lgar 38 z-...@us...-20080224225219-0arhdm8hw42hptrf 39 z-...@us...-20080225000421-fh9p1qmu32awa41y 40 z-...@us...-20080225000607-bsvlilqbv5ssltr3 41 z-...@us...-20080225003311-fnfdbdvp3p2bw8b4 42 z-...@us...-20080225013618-jrkbe6q8gpdzbj3n 43 z-...@us...-20080225015144-8j759e33zdztmena 44 z-...@us...-20080225022114-1360a7t61rtei61d 45 z-...@us...-20080225023750-vf22upkbeiyoclbc 46 z-...@us...-20080225024308-j2a0nomtfuzfbjf8 47 z-...@us...-20080225100512-ck04wcqo0w3jibyq 48 z-...@us...-20080225103727-f42008yfu3y6q5r5 49 z-...@us...-20080225113757-opine59p0ak9r6h0 50 z-...@us...-20080225115932-akfi8jo7apw0phkk 51 z-...@us...-20080225120844-31fhi28emjcs4ys6 52 z-...@us...-20080225122224-wrmmr1nt5w9106rg 53 z-...@us...-20080225123606-ts2l2h3aivk9pplp 54 z-...@us...-20080225145431-x956npu0w5htu7sa 55 z-...@us...-20080225152517-hejvwwjukez9aemh 56 z-...@us...-20080225154230-rpq3t8xnbu99mx4t 57 z-...@us...-20080225162001-ukwye8clhep133jz 58 z-...@us...-20080225162148-mvmfjwz461o7xvaa 59 z-...@us...-20080225164010-oej2am8f8ysxnu3n 60 z-...@us...-20080225175844-w74is4pxw6zefuou 61 z-...@us...-20080225185644-df7z71i5bh7056tw 62 z-...@us...-20080225231713-lk9zjwf6tlmck94z 63 z-...@us...-20080226004842-kj1448gvijflyn6b 64 z-...@us...-20080226012214-xipk2o8idaj0rzoz 65 z-...@us...-20080226013159-8zq7m6hatobv71x4 66 z-...@us...-20080226110837-nfl4khd9y39rdmir 67 z-...@us...-20080226111231-7fvp5r7eu9flwx7s 68 z-...@us...-20080226121838-20m97dmv5sj8kifs 69 z-...@us...-20080226122134-71pekd0jywe5n39l 70 z-...@us...-20080226122505-1u5cfryv0elid3f2 71 z-...@us...-20080226123432-rzi9qkm2whs3sad6 72 z-...@us...-20080226133113-lyap55resu8kx0gm 73 z-...@us...-20080226133403-riqoo03f2f2a4gfz 74 z-...@us...-20080226134345-0tnwohpjgizklima 75 z-...@us...-20080226135301-1han96uhxd6h20o1 76 z-...@us...-20080226152207-k1x8v7lhaohj7a2t 77 z-...@us...-20080226164517-0fe0sjgs2w3s068q 78 z-...@us...-20080226180445-7mirqm5kadxsw7xe 79 z-...@us...-20080226180620-r5zevfu34hhift7u 80 z-...@us...-20080226182045-3z6m4ro8plxl54ez 81 z-...@us...-20080226182221-kwy2lawqkrnxe0d1 82 z-...@us...-20080226183252-zzixyvv6qpvfa890 83 z-...@us...-20080226215727-f2gnksz8mhrz3724 84 z-...@us...-20080226225036-eqqn8w2xg9e5rwb0 85 z-...@us...-20080227010033-yv56bad7bzsigjsa 86 z-...@us...-20080227010301-sdd19fx9u1exk8vm 87 z-...@us...-20080227073015-l4d401obwe0pzikc 88 z-...@us...-20080227080340-rficjl3b14lpa7e2 89 z-...@us...-20080227085925-zbxz1mxphbo1wjbz 90 z-...@us...-20080227090604-hk5xhmg1o6qgn7dd 91 z-...@us...-20080227091521-tv7nw3wvujyoa3m8 92 z-...@us...-20080227104314-2qtpk2aissulpfh2 93 z-...@us...-20080227104725-uypq0ke8hneli474 94 z-...@us...-20080227105641-cz7upcrqj5wq20iq 95 z-...@us...-20080227132905-2asg8nz2d4w5xh7p 96 z-...@us...-20080227133735-ox85ierzxh7ocaen 97 z-...@us...-20080227134040-6cg8dc85c3obbrit 98 z-...@us...-20080227144423-xy2pa72pkhqxr2oh + 4 z-...@us...-20080222202821-mkuiwckx41jof2gj 5 z-...@us...-20080222202957-htiysaaxkiroqd7e 6 z-...@us...-20080222211806-jc50b77qlgn2dp8j 7 z-...@us...-20080222215601-p8y78c77ncvq5eb1 8 z-...@us...-20080222223809-mmh9wh6yzrdm7oa1 9 z-...@us...-20080222232123-uhnuqd9db0p27rkf 10 z-...@us...-20080222232154-k64q4ee9zuq5r2jp 11 z-...@us...-20080222234236-ny0hc8lwybz73rv6 12 z-...@us...-20080223000039-566psft2c96236kw 13 z-...@us...-20080223000530-4mtket15l6oeo1ju 14 z-...@us...-20080223001030-5t86d3u3bidpoq6r 15 z-...@us...-20080223002857-qvx8z72tmsoguku0 16 z-...@us...-20080223004917-abqn3vdfqb1euyzc 17 z-...@us...-20080223010025-h0nul9yntjvutdbq 18 z-...@us...-20080223013357-1nzhrjwjr4g0h7g9 19 z-...@us...-20080223015240-btmt95d1vvlip4gl 20 z-...@us...-20080223124731-dlwuagon76gq2o3g 21 z-...@us...-20080223133015-0hjqyrki59ydwdcv 22 z-...@us...-20080223135113-icwd4g99yev9n0u2 23 z-...@us...-20080223152916-8rm942q1rmjlueca 24 z-...@us...-20080223174524-3lb2wm6tt5nytd4b 25 z-...@us...-20080223174610-gwmr3fn8456rwvmg 26 z-...@us...-20080223183115-ub0hshkf3zfs69ko 27 z-...@us...-20080223185539-cvhsltp2u12d5lgc 28 z-...@us...-20080223211352-km18u9bp9qhufyta 29 z-...@us...-20080223225132-94n2bwt307fujbg4 30 z-...@us...-20080223234541-mqp3d64uyn3no98y 31 z-...@us...-20080223235231-5lshcanhqlkwv36n 32 z-...@us...-20080224001425-n6xziwrp0hh3nz2f 33 z-...@us...-20080224161454-lyyn0grllfn5qx8w 34 z-...@us...-20080224180639-fr6dqfch7kboocs0 35 z-...@us...-20080224181843-8iq9zyjoz4dprm8b 36 z-...@us...-20080224224147-cmxp11hux8yn3jbp 37 z-...@us...-20080224224848-0h65c9bpg637lgar 38 z-...@us...-20080224225219-0arhdm8hw42hptrf 39 z-...@us...-20080225000421-fh9p1qmu32awa41y 40 z-...@us...-20080225000607-bsvlilqbv5ssltr3 41 z-...@us...-20080225003311-fnfdbdvp3p2bw8b4 42 z-...@us...-20080225013618-jrkbe6q8gpdzbj3n 43 z-...@us...-20080225015144-8j759e33zdztmena 44 z-...@us...-20080225022114-1360a7t61rtei61d 45 z-...@us...-20080225023750-vf22upkbeiyoclbc 46 z-...@us...-20080225024308-j2a0nomtfuzfbjf8 47 z-...@us...-20080225100512-ck04wcqo0w3jibyq 48 z-...@us...-20080225103727-f42008yfu3y6q5r5 49 z-...@us...-20080225113757-opine59p0ak9r6h0 50 z-...@us...-20080225115932-akfi8jo7apw0phkk 51 z-...@us...-20080225120844-31fhi28emjcs4ys6 52 z-...@us...-20080225122224-wrmmr1nt5w9106rg 53 z-...@us...-20080225123606-ts2l2h3aivk9pplp 54 z-...@us...-20080225145431-x956npu0w5htu7sa 55 z-...@us...-20080225152517-hejvwwjukez9aemh 56 z-...@us...-20080225154230-rpq3t8xnbu99mx4t 57 z-...@us...-20080225162001-ukwye8clhep133jz 58 z-...@us...-20080225162148-mvmfjwz461o7xvaa 59 z-...@us...-20080225164010-oej2am8f8ysxnu3n 60 z-...@us...-20080225175844-w74is4pxw6zefuou 61 z-...@us...-20080225185644-df7z71i5bh7056tw 62 z-...@us...-20080225231713-lk9zjwf6tlmck94z 63 z-...@us...-20080226004842-kj1448gvijflyn6b 64 z-...@us...-20080226012214-xipk2o8idaj0rzoz 65 z-...@us...-20080226013159-8zq7m6hatobv71x4 66 z-...@us...-20080226110837-nfl4khd9y39rdmir 67 z-...@us...-20080226111231-7fvp5r7eu9flwx7s 68 z-...@us...-20080226121838-20m97dmv5sj8kifs 69 z-...@us...-20080226122134-71pekd0jywe5n39l 70 z-...@us...-20080226122505-1u5cfryv0elid3f2 71 z-...@us...-20080226123432-rzi9qkm2whs3sad6 72 z-...@us...-20080226133113-lyap55resu8kx0gm 73 z-...@us...-20080226133403-riqoo03f2f2a4gfz 74 z-...@us...-20080226134345-0tnwohpjgizklima 75 z-...@us...-20080226135301-1han96uhxd6h20o1 76 z-...@us...-20080226152207-k1x8v7lhaohj7a2t 77 z-...@us...-20080226164517-0fe0sjgs2w3s068q 78 z-...@us...-20080226180445-7mirqm5kadxsw7xe 79 z-...@us...-20080226180620-r5zevfu34hhift7u 80 z-...@us...-20080226182045-3z6m4ro8plxl54ez 81 z-...@us...-20080226182221-kwy2lawqkrnxe0d1 82 z-...@us...-20080226183252-zzixyvv6qpvfa890 83 z-...@us...-20080226215727-f2gnksz8mhrz3724 84 z-...@us...-20080226225036-eqqn8w2xg9e5rwb0 85 z-...@us...-20080227010033-yv56bad7bzsigjsa 86 z-...@us...-20080227010301-sdd19fx9u1exk8vm 87 z-...@us...-20080227073015-l4d401obwe0pzikc 88 z-...@us...-20080227080340-rficjl3b14lpa7e2 89 z-...@us...-20080227085925-zbxz1mxphbo1wjbz 90 z-...@us...-20080227090604-hk5xhmg1o6qgn7dd 91 z-...@us...-20080227091521-tv7nw3wvujyoa3m8 92 z-...@us...-20080227104314-2qtpk2aissulpfh2 93 z-...@us...-20080227104725-uypq0ke8hneli474 94 z-...@us...-20080227105641-cz7upcrqj5wq20iq 95 z-...@us...-20080227132905-2asg8nz2d4w5xh7p 96 z-...@us...-20080227133735-ox85ierzxh7ocaen 97 z-...@us...-20080227134040-6cg8dc85c3obbrit 98 z-...@us...-20080227144423-xy2pa72pkhqxr2oh 99 z-...@us...-20080227145130-vnavq6f9nsagzjoy Modified: clio/trunk/clio/clio/dataconversion.hpp =================================================================== --- clio/trunk/clio/clio/dataconversion.hpp 2008-02-27 14:48:54 UTC (rev 8161) +++ clio/trunk/clio/clio/dataconversion.hpp 2008-02-27 14:57:09 UTC (rev 8162) @@ -279,9 +279,9 @@ // data conversion function storage and retrieval. template< typename ORIGINAL > struct DataConverterManagerBase< Const< ORIGINAL > const * >: -public DataConverterManagerBase< ORIGINAL const * > +public DataConverterDefs< Const< ORIGINAL > const * > { - typedef ORIGINAL const * Converted; + typedef Const< ORIGINAL > const * Converted; // convert return value from Io to C++ static Converted FromIo( IoObject * in, DataConversionCall const & call, IExceptionThrower const & thrower = BasicExceptionThrower::thrower ) @@ -290,7 +290,8 @@ // templates are overloaded both with <const T> and <T>, // the <T> variant is preferred. call.quality.conversionSteps ++; - return DataConverterManager< ORIGINAL const * >::FromIo( in, call, thrower ); + DataConverterManager< ORIGINAL const * >::FromIo( in, call, thrower ); + return 0; } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |