From df0b5cb4757dc843cfb90d7a846446ed32e3e0a2 Mon Sep 17 00:00:00 2001 From: Eric Wing Date: Sun, 3 Feb 2008 14:20:26 -0800 Subject: [PATCH] CVS resync --- CMakeLua/.hg/dirstate | Bin 105899 -> 105899 bytes CMakeLua/.hg/store/00changelog.i | Bin 129021 -> 130558 bytes CMakeLua/.hg/store/00manifest.d | Bin 135868 -> 136526 bytes CMakeLua/.hg/store/00manifest.i | Bin 28544 -> 28928 bytes CMakeLua/.hg/store/data/_source/cm_c_test.cxx.i | Bin 16620 -> 16817 bytes CMakeLua/.hg/store/data/_source/cm_c_test.h.i | Bin 4513 -> 4703 bytes .../.hg/store/data/_source/kwsys/_i_o_stream.cxx.i | Bin 2438 -> 2667 bytes .../data/_source/kwsys/_system_information.cxx.i | Bin 27772 -> 28164 bytes .../store/data/_source/kwsys/hash__set.hxx.in.i | Bin 2444 -> 2555 bytes .../_tests/_export_import/_export/test_exe1.c.i | Bin 427 -> 533 bytes .../_tests/_export_import/_export/test_exe1lib.c.i | Bin 97 -> 198 bytes .../_tests/_export_import/_export/test_lib1.c.i | Bin 94 -> 192 bytes .../_tests/_export_import/_export/test_lib2.c.i | Bin 116 -> 254 bytes CMakeLua/.hg/store/undo | Bin 106 -> 98 bytes CMakeLua/.hg/undo.dirstate | Bin 105899 -> 105899 bytes CMakeLua/Source/CVS/Entries | 4 +- CMakeLua/Source/cmCTest.cxx | 6 +- CMakeLua/Source/cmCTest.h | 6 +- CMakeLua/Source/kwsys/CVS/Entries | 6 +- CMakeLua/Source/kwsys/IOStream.cxx | 13 ++ CMakeLua/Source/kwsys/SystemInformation.cxx | 14 +- CMakeLua/Source/kwsys/hash_set.hxx.in | 8 +- CMakeLua/Tests/ExportImport/Export/CVS/Entries | 8 +- CMakeLua/Tests/ExportImport/Export/testExe1.c | 2 +- CMakeLua/Tests/ExportImport/Export/testExe1lib.c | 2 +- CMakeLua/Tests/ExportImport/Export/testLib1.c | 2 +- CMakeLua/Tests/ExportImport/Export/testLib2.c | 4 +- project.log | 108 +++++++++ tailor.state | 10 +- tailor.state.old | 249 ++++++++++++++++++--- 30 files changed, 373 insertions(+), 69 deletions(-) diff --git a/CMakeLua/.hg/dirstate b/CMakeLua/.hg/dirstate index f5e42d6fbf7e13d3d001980cf19abac90de14972..63b2a092c0429532bb5f6d1cf7d8b6ff5d18b9bf 100644 GIT binary patch delta 238 zcwSq*n{D-OHj$*6?{Xb7%zt0ovGP^Dn(E51C7G8tif{=|zGrT_Sx)eP+T^$Z%grJd zB8;qx?#pb`CJUZZ-5g}OT!=Lq$W7V&&pUx-^Rxg-8CG|=^vxWt7?h?@>|+$(oPXAYaq`&@hMP~GV^NyC_?+72e;=;8v8sSfnVu`k zsJi{HIpYOB)@MM0?P|UFiS- delta 221 zcwPbB03!dZy9TSf1{5WiTblW56G85Mk$Rrbv!{DtPerj53K6qY5x^#s9uYOOOE?t) z0UeW$ye6}UIjRx`R7a!TCbKq7U<8vBI61SIP#7EmKa-BUCbQOTQC$W^143XHRFklP z7PCXj4+9E*6-T9l^Z)<=BA1bl0TZ)t%`^d%*zhK^)XoGVlcUZtv;OeaMg<^8o*@U9 zZ506}xBWK(&<+LOM`auyx6(!d3jqbPN2APnH%%dR0}RB$uJTvwmyKt zcXGSpr%QDHc^2t+lQKCTnK`OKn zl#H1FrgdYiI)BZ&XzlwKD&NU`o4}tNcevX~aZ=v{yaT3j3+$$8T=HRmBmX`-{BFN>1D33 zchkn=c}FHW+T=kxtlt>m&qejMteX%Xf&N!Wymg-uZ^uzS!y*0BY;M2OeK)FI1qFr8 ziU2rBEOXeH-F|#L;Bq6dny>BDDCJW@8s)ceC`u>X)O=M@@0LWvjnEQF=;mkp_h()t zfT3ABvhPL~`YkI}ELHU8JC#d@ppuCM0JbOd%dF6iWQ&+fI76FbMn`7V--2*0`Tq-y2GG#NBd>x;kC?+ z?MmBOouy^0j+NCQ;{2psdIIK9MbuN8Je={LK?y@q_s|giLv9F z98|*PsdWT+?z3a6wE4FQHuo49@h;-0|HQHx1V^i_)KKZYHhymjsH~?j4h8m}GGnPR z={o@Cw*@hnD`_|FEOjr>?1tzJhM2SDp~%<@=4(g&=Gm)uOKuKfs!b!KyB-x(y{!2L zQ7oYEGrn%-@4Q7!?0wiT0VwPy3m15^;4>R2YA|-%vtn%{a6*>D@`*J(%$H8f0 z!^DOI8Jt^lAF7#`~=@DmIKp&1Y30jD{^ z8Lx%;F#RB#cun-3oTDM`MQA=4w=m}`o@;} z^tPm~Iq-I|X2bwRw~}W0lWcb=1I+QnuDyfRS^lc39+MTpvPvBa+_Jn)lS+2=JiFJQ zf+Zn3RS(98&)cmuNQ|Be9!I%97snaiq9<@z<`#09m%q)eU;es@QXUVOOOo9F&Od05v64|v-&j?Q;vNtkx@jAPGraI2yRw?zzaTN` zI%GgI2pcR#{^2$`M3v$dyNHUgz^~{5>j&|4oIWvCAz2oc{fTkTT#!hah2+?K(^v;d zmfW#TFh?^{($a(^kF%zf(JZZ-|7^T<){D+)OS|D$Gg#1p(sZ}2>=B%;?BVLJFaQ2p-75XEg!1m5lH Ee+yWy*#H0l delta 11 TcwYPWoBi*5_J%Etf4>6&E8zzn diff --git a/CMakeLua/.hg/store/00manifest.d b/CMakeLua/.hg/store/00manifest.d index 4f3f0e9ca4766e326c4eee86bf75abdf05fe622e..4ac3026b8af6e03d8531d548d83a32a1c811bf34 100644 GIT binary patch delta 590 zcwPZc0mQ2+ri*#H4B9{>OVMpJKfa${vLYj<;bb1!INb7)_4 zWpplRcz7;pZU8egWjQl6GB+||Fk>|^HexU~I5ageV`XMBHZx^8H!)!}GiEt4I5(Hj z3<5AHVKZfAG&o^qF<~<^VmV=EGcz+{V_`F7VKFpjIWcB5GcjXiIW;*lmw^oeF@G^; zI5jpjF*P|dHa1~pVmUTuVlXi?F=jV0Gh;S6I59XkGc-9hHDh=Rc${6!yAi@L3;v8|dB!UFmp4aXh7%V61tWuWHu4`2^~{R05+_4c}39PN5K$K!dhZ3D7p1Uj`@ z-F1|fmJPF3q%wL(RGk+p4NyXeqgzYyBF<51&L@;|dRPECj25Bb2c$|gM zO-e*D48ZZerSC9K)8?xOn1$fd3p8yC1B&9j#auubJ%ixZt9c7M;M&;)Lg2@rgynn_ zmh*QA;p@SV+i|x)y*$5ecTbo3x9qlg*`FM4Td0+K>A9BFiY6gI^O#8!M1Re>P`5T( zzpRjzq&D78T@%w{aQU~MkN$2Q= z+bA(A8M{}j#G=@>cgluWQm2-t*0eKAMac653Sbg7s&K)ED0QUb*iz#47Z%@WJ^%qI zO#lHXkN^MxLsM^ca${vLYdd#yd2=sGPg8VqWnpbDV|aJ~Hf1?wGB7nWV=`qjWo9yC cVmLBlV>vKmH8LDRnG$$J;uA!SDv^VYt!?lQih9nX>U)B>e|LW`OidG|br;yzPbQ>u2d} zSqfc3{=7Q-8=g<^Ikj`)`SYcz%i2T4mSklVF*0nCR1pIJuf9F# delta 9 QcwXDs%=o5}al;!202Z1AfB*mh diff --git a/CMakeLua/.hg/store/data/_source/cm_c_test.h.i b/CMakeLua/.hg/store/data/_source/cm_c_test.h.i index 7db90f15257ef73cbbf8c6aa8f73b43af38b5817..42616d9f76c773beb907cae8aaa685e219a32d2c 100644 GIT binary patch delta 197 zcwSqmd|ze5Lcw|lAP`gpkqmVV4EoQ&EC$AdAmTp|Flojco;|#3j+2ej%U#{;Ue2x2 z-p+soD&{07B-}W9;J}G92M#<~y5Pa2h)G#X8Q8Q0woPnoY~9y5abM%criB})uG~4b zb72$L^d_f>tiZywIysMxUIAH?^90!}GZGl4q$fN$!~7_2!OAQyuA{1&VPQvAU1wIl l$2A}yQi9`MH46fBmmZVTEa@R40fBz)45aOso&o=L7trhiV^R{A!{ z?C=@$!#8S#@4577y3{9 zVt97yq{*>a`kY|~CfkfmHX3c49GESh*2B|yiKl0)cEbfYbVVr>|^byES>{vIPq}@|u=0 Li8K6JYfuLOm+*2x delta 9 QcwTF{!}#Y0_17GJhHa41S+S|8xH#(}ycdVYsVzQ<2hK%O{Mvd1O_{13)7Mb#R F0sttHCT{=$ delta 7 OcwYN0+#|f9hZ6t|j{@@m diff --git a/CMakeLua/.hg/store/data/_tests/_export_import/_export/test_exe1.c.i b/CMakeLua/.hg/store/data/_tests/_export_import/_export/test_exe1.c.i index f57fe4ba3acb5f0ac155621148e302fc25f471c3..3ad398c9a3f44e54ff9e08936f81656827e9737a 100644 GIT binary patch delta 114 zcwSr0Je6g`YQ`)EAYjx6kqlZu);2JUf$zvYL6rYDNGG`~su^ diff --git a/CMakeLua/.hg/store/data/_tests/_export_import/_export/test_exe1lib.c.i b/CMakeLua/.hg/store/data/_tests/_export_import/_export/test_exe1lib.c.i index 27b4ce1aad51feeadb1c9aafef24c12cf55528fb..c15b6f07dc0fb78071a1917410ab5a156fcebb20 100644 GIT binary patch delta 107 zcwS39#yBA{l>r14!K5k>s{k=05FG*u{09Qwpfd5cXN4Zp+oK-udM)aqvg2U{0}?3B o%qvkSNi8mMtw=S@$xPBH%g;>FRH#-cN-ZfZ%2P0~R;c9y0HT5&ng9R* delta 5 McwRfkm^dL300xT!8UO$Q diff --git a/CMakeLua/.hg/store/data/_tests/_export_import/_export/test_lib1.c.i b/CMakeLua/.hg/store/data/_tests/_export_import/_export/test_lib1.c.i index f52777103895c0026d880e79be1004f541855044..a471d7664f751b673658124725426978c213de19 100644 GIT binary patch delta 104 zcwUP;z&If;i2(%Uz@!ooD*`bi5FG*u{0D+>{?8K)UgrE{Xx;X1_0sf~8+U`ZFd%`_ l%)AnXlGNf7pUfmfjk5gA6itO{g`(7w(xN;C18ap^E&%BLA2a{} delta 5 McwRfe7&jpf00vB=La`Dav|dpG?#BjTH_w_uBkz-{J@Vw3g= ey2LGvTBxygiO34^b=>}!qZUr%X874C5efh@3^d9B delta 5 McwYO*STdmm00-{^cmMzZ diff --git a/CMakeLua/.hg/store/undo b/CMakeLua/.hg/store/undo index 90df5481356aa6ca60afc9b053d05fc3e9e2b2ab..fe2c74c83cab1c0c2efacdda81fae4d5e28050c4 100644 GIT binary patch literal 98 zcwS3MEJ@T4&Mz%WPSwvYFRm=s_w)}gDN0Su)l06Z(92{nGBLK`GBC(Z%*#wmEiTbZ nVK6i{Gchqo76YoXurMxWI`7Q6m`R_LA7xyyAJRD5m{79f@?8r+kiBX{wkH r?lLCgkqy?^PRfj1oT*gqnKE_&^}on8^dMWg1-C%!9@;4lp!@Cxge@Ts diff --git a/CMakeLua/.hg/undo.dirstate b/CMakeLua/.hg/undo.dirstate index 76495e8eb6a2b95fbdbe3d2c6e4950474d75ba1a..d6fff14123d64fd132f6b382a50f607d58f14ff7 100644 GIT binary patch delta 229 zcwSq*n{D-OHjxb*PC5S&Ub)WVw7U1IeI}PrL?^mz6e%&E?&QO0v3ak#C?l()`!d_K z>HCWqRX6{!XcJBpLS;~XPMk#ZaTfnhjBIQTLuQEvyTJWS{J@ UNR&zN-}H@qjKbRsd>O3+0PDwFp#T5? delta 221 zcwSq*n{D-OHj(HCWqRX6{)XcJ-$abJ8_ZF84*qB!IG&2N(4a_Ar7bk_7+3G~ymo|Obbk>`3^7apEn`_QlD^2!3XSn(9hso@l7yq!b=TvZ?r^wF0 zz@R?8(T-7ZJG%wr1U}Y#?x`|z+vm73ax=1Sa$kJM8Dx>t_H*uxConfigType; } diff --git a/CMakeLua/Source/cmCTest.h b/CMakeLua/Source/cmCTest.h index c35ea1d..6ede366 100644 --- a/CMakeLua/Source/cmCTest.h +++ b/CMakeLua/Source/cmCTest.h @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmCTest.h,v $ Language: C++ - Date: $Date: 2007/12/13 22:56:49 $ - Version: $Revision: 1.99 $ + Date: $Date: 2008/02/03 13:57:41 $ + Version: $Revision: 1.100 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -92,7 +92,7 @@ public: int TestDirectory(bool memcheck); ///! what is the configuraiton type, e.g. Debug, Release etc. - std::string GetConfigType(); + std::string const& GetConfigType(); double GetTimeOut() { return this->TimeOut; } void SetTimeOut(double t) { this->TimeOut = t; } diff --git a/CMakeLua/Source/kwsys/CVS/Entries b/CMakeLua/Source/kwsys/CVS/Entries index ec00894..fd35463 100644 --- a/CMakeLua/Source/kwsys/CVS/Entries +++ b/CMakeLua/Source/kwsys/CVS/Entries @@ -18,7 +18,6 @@ /FundamentalType.h.in/1.1/Tue Jul 26 15:37:30 2005//T1.1 /Glob.cxx/1.13/Tue Aug 21 19:30:07 2007//T1.13 /Glob.hxx.in/1.7/Thu Aug 16 11:38:47 2007//T1.7 -/IOStream.cxx/1.1/Sun Aug 27 17:17:23 2006//T1.1 /IOStream.hxx.in/1.1/Sun Aug 27 17:17:23 2006//T1.1 /MD5.c/1.1/Wed Mar 14 19:12:10 2007//T1.1 /MD5.h.in/1.1/Wed Mar 14 19:12:10 2007//T1.1 @@ -35,7 +34,6 @@ /Terminal.h.in/1.2/Tue Apr 25 12:33:51 2006//T1.2 /auto_ptr.hxx.in/1.12/Fri Mar 9 21:58:08 2007//T1.12 /hash_fun.hxx.in/1.2/Fri Apr 15 20:00:44 2005//T1.2 -/hash_set.hxx.in/1.4/Fri Apr 15 19:30:28 2005//T1.4 /hashtable.hxx.in/1.18/Fri Mar 9 21:27:14 2007//T1.18 /kwsysDateStamp.py/1.2/Mon Nov 12 23:22:22 2007//T1.2 /kwsysHeaderDump.pl/1.3/Mon May 10 17:15:45 2004//T1.3 @@ -77,6 +75,8 @@ /kwsysPlatformTestsCXX.cxx/1.3/Sat Feb 2 03:01:22 2008//T1.3 /CMakeLists.txt/1.136/Sat Feb 2 03:01:29 2008//T1.136 /SystemInformation.hxx.in/1.7/Sat Feb 2 03:01:33 2008//T1.7 -/SystemInformation.cxx/1.20/Sun Feb 3 09:01:40 2008//T1.20 /kwsysDateStamp.cmake/1.85/Sun Feb 3 09:01:42 2008//T1.85 +/hash_set.hxx.in/1.5/Sun Feb 3 22:17:01 2008//T1.5 +/SystemInformation.cxx/1.22/Sun Feb 3 22:17:05 2008//T1.22 +/IOStream.cxx/1.2/Sun Feb 3 22:17:13 2008//T1.2 D diff --git a/CMakeLua/Source/kwsys/IOStream.cxx b/CMakeLua/Source/kwsys/IOStream.cxx index 8d9b663..ab710cf 100644 --- a/CMakeLua/Source/kwsys/IOStream.cxx +++ b/CMakeLua/Source/kwsys/IOStream.cxx @@ -267,4 +267,17 @@ kwsys_ios::ostream& IOStreamPrint(kwsys_ios::ostream& os, IOStreamULL value) } // namespace KWSYS_NAMESPACE +#else + +namespace KWSYS_NAMESPACE +{ + +// Create one public symbol in this object file to avoid warnings from +// archivers. +void IOStreamSymbolToAvoidWarning() +{ +} + +} // namespace KWSYS_NAMESPACE + #endif // KWSYS_IOS_NEED_OPERATORS_LL diff --git a/CMakeLua/Source/kwsys/SystemInformation.cxx b/CMakeLua/Source/kwsys/SystemInformation.cxx index 9c0b689..48d58f9 100755 --- a/CMakeLua/Source/kwsys/SystemInformation.cxx +++ b/CMakeLua/Source/kwsys/SystemInformation.cxx @@ -3,8 +3,8 @@ Program: BatchMake Module: $RCSfile: SystemInformation.cxx,v $ Language: C++ - Date: $Date: 2008/02/02 21:18:35 $ - Version: $Revision: 1.20 $ + Date: $Date: 2008/02/03 13:20:11 $ + Version: $Revision: 1.22 $ Copyright (c) 2005 Insight Consortium. All rights reserved. See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details. @@ -2927,8 +2927,8 @@ bool SystemInformationImplementation::QueryOSInformation() // Try calling GetVersionEx using the OSVERSIONINFOEX structure. ZeroMemory (&osvi, sizeof (OSVERSIONINFOEX)); osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX); - - if (!(bOsVersionInfoEx = GetVersionEx ((OSVERSIONINFO *) &osvi))) + bOsVersionInfoEx = GetVersionEx ((OSVERSIONINFO *) &osvi); + if (!bOsVersionInfoEx) { osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); if (!GetVersionEx ((OSVERSIONINFO *) &osvi)) @@ -3154,11 +3154,7 @@ bool SystemInformationImplementation::QueryOSInformation() /** Return true if the machine is 64 bits */ bool SystemInformationImplementation::Is64Bits() { - if(sizeof(long int) == 4) - { - return false; - } - return true; + return (sizeof(void*) == 8); } } // namespace @KWSYS_NAMESPACE@ diff --git a/CMakeLua/Source/kwsys/hash_set.hxx.in b/CMakeLua/Source/kwsys/hash_set.hxx.in index 10111d3..106e56d 100644 --- a/CMakeLua/Source/kwsys/hash_set.hxx.in +++ b/CMakeLua/Source/kwsys/hash_set.hxx.in @@ -73,7 +73,7 @@ template -inline bool +bool operator==(const hash_set<_Value,_HashFcn,_EqualKey,_Alloc>& __hs1, const hash_set<_Value,_HashFcn,_EqualKey,_Alloc>& __hs2); @@ -232,7 +232,7 @@ public: }; template -inline bool +bool operator==(const hash_set<_Value,_HashFcn,_EqualKey,_Alloc>& __hs1, const hash_set<_Value,_HashFcn,_EqualKey,_Alloc>& __hs2) { @@ -261,7 +261,7 @@ template -inline bool +bool operator==(const hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs1, const hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs2); @@ -412,7 +412,7 @@ public: }; template -inline bool +bool operator==(const hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs1, const hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs2) { diff --git a/CMakeLua/Tests/ExportImport/Export/CVS/Entries b/CMakeLua/Tests/ExportImport/Export/CVS/Entries index c968045..d310d82 100644 --- a/CMakeLua/Tests/ExportImport/Export/CVS/Entries +++ b/CMakeLua/Tests/ExportImport/Export/CVS/Entries @@ -1,13 +1,13 @@ /testExe2.c/1.1/Mon Jan 28 13:40:20 2008//T1.1 -/testLib1.c/1.1/Mon Jan 28 13:40:20 2008//T1.1 -/testLib2.c/1.1/Mon Jan 28 13:40:20 2008//T1.1 /testLib4.c/1.1/Mon Jan 28 18:06:17 2008//T1.1 -/testExe1lib.c/1.1/Mon Jan 28 18:37:59 2008//T1.1 -/testExe1.c/1.2/Sat Feb 2 02:58:11 2008//T1.2 /testExe3.c/1.1/Mon Jan 28 19:46:16 2008//T1.1 /testExe2lib.c/1.1/Wed Jan 30 22:26:09 2008//T1.1 /testExe2libImp.c/1.1/Wed Jan 30 22:26:09 2008//T1.1 /testLib3Imp.c/1.1/Wed Jan 30 22:26:09 2008//T1.1 /testLib3.c/1.2/Sat Feb 2 03:00:47 2008//T1.2 /CMakeLists.txt/1.9/Sat Feb 2 03:03:15 2008//T1.9 +/testExe1lib.c/1.2/Sun Feb 3 22:17:10 2008//T1.2 +/testLib1.c/1.2/Sun Feb 3 22:17:10 2008//T1.2 +/testLib2.c/1.2/Sun Feb 3 22:17:10 2008//T1.2 +/testExe1.c/1.3/Sun Feb 3 22:17:11 2008//T1.3 D diff --git a/CMakeLua/Tests/ExportImport/Export/testExe1.c b/CMakeLua/Tests/ExportImport/Export/testExe1.c index 8ac154f..e00fac7 100644 --- a/CMakeLua/Tests/ExportImport/Export/testExe1.c +++ b/CMakeLua/Tests/ExportImport/Export/testExe1.c @@ -1,6 +1,6 @@ #include -extern int testExe1lib(); +extern int testExe1lib(void); int main(int argc, const char* argv[]) { diff --git a/CMakeLua/Tests/ExportImport/Export/testExe1lib.c b/CMakeLua/Tests/ExportImport/Export/testExe1lib.c index 60cd746..7ad48a3 100644 --- a/CMakeLua/Tests/ExportImport/Export/testExe1lib.c +++ b/CMakeLua/Tests/ExportImport/Export/testExe1lib.c @@ -1 +1 @@ -int testExe1lib() { return 0; } +int testExe1lib(void) { return 0; } diff --git a/CMakeLua/Tests/ExportImport/Export/testLib1.c b/CMakeLua/Tests/ExportImport/Export/testLib1.c index 5491bf9..35bb1e5 100644 --- a/CMakeLua/Tests/ExportImport/Export/testLib1.c +++ b/CMakeLua/Tests/ExportImport/Export/testLib1.c @@ -1 +1 @@ -int testLib1() { return 0; } +int testLib1(void) { return 0; } diff --git a/CMakeLua/Tests/ExportImport/Export/testLib2.c b/CMakeLua/Tests/ExportImport/Export/testLib2.c index 5feb83d..aabc0d3 100644 --- a/CMakeLua/Tests/ExportImport/Export/testLib2.c +++ b/CMakeLua/Tests/ExportImport/Export/testLib2.c @@ -1,4 +1,4 @@ -extern int testLib1(); +extern int testLib1(void); -int testLib2() { return testLib1(); } +int testLib2(void) { return testLib1(); } diff --git a/project.log b/project.log index fab37b6..764dece 100644 --- a/project.log +++ b/project.log @@ -9955,3 +9955,111 @@ Log: STYLE: Nightly Date Stamp 2008-02-03 01:05:54 INFO: [Ok] 2008-02-03 01:05:59 INFO: Cached information about 0 pending changesets 2008-02-03 01:05:59 INFO: Update completed with no upstream changes +2008-02-03 14:16:09 INFO: Updating "project" in "/Users/ewing/Source/CMAKELUA/TAILOR" +2008-02-03 14:16:09 DEBUG: cvs not found as new-style vcs, trying as monolithic +2008-02-03 14:16:09 DEBUG: hg not found as new-style vcs, trying as monolithic +2008-02-03 14:16:09 INFO: $ cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake rlog -d "2008-02-03 05:01:02 UTC<" -b CMake 2>&1 +2008-02-03 14:16:09 DEBUG: Executing cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake rlog -d "2008-02-03 05:01:02 UTC<" -b CMake ('/Users/ewing/Source/CMAKELUA/TAILOR') +2008-02-03 14:16:40 INFO: [Ok] +2008-02-03 14:16:45 INFO: Cached information about 6 pending changesets +2008-02-03 14:16:45 INFO: Applying pending upstream changesets +2008-02-03 14:16:45 INFO: Changeset #1 +2008-02-03 14:16:45 INFO: Changeset "2008-02-03 13:07:17 by king" +2008-02-03 14:16:45 INFO: Log message: COMP: Remove inline keyword from forward declaration for VS9. +2008-02-03 14:16:45 DEBUG: Going to apply changeset: +Revision: 2008-02-03 13:07:17 by king +Date: 2008-02-03 13:07:17+00:00 +Author: king +Entries: Source/kwsys/hash_set.hxx.in(UPD to 1.5) +Log: COMP: Remove inline keyword from forward declaration for VS9. +2008-02-03 14:16:56 INFO: /Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua $ cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.5 Source/kwsys/hash_set.hxx.in +2008-02-03 14:16:56 DEBUG: Executing cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.5 Source/kwsys/hash_set.hxx.in ('/Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua') +2008-02-03 14:17:02 INFO: [Ok] +2008-02-03 14:17:02 DEBUG: Source/kwsys/hash_set.hxx.in updated to 1.5 +2008-02-03 14:17:02 INFO: Committing u'2008-02-03 13:07:17 by king'... +2008-02-03 14:17:02 INFO: -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +2008-02-03 14:17:02 INFO: Changeset #2 +2008-02-03 14:17:02 INFO: Changeset "2008-02-03 13:14:38 by king" +2008-02-03 14:17:02 INFO: Log message: COMP: Fix unreachable code warning. Remove runtime test of constant information. +2008-02-03 14:17:02 DEBUG: Going to apply changeset: +Revision: 2008-02-03 13:14:38 by king +Date: 2008-02-03 13:14:38+00:00 +Author: king +Entries: Source/kwsys/SystemInformation.cxx(UPD to 1.21) +Log: COMP: Fix unreachable code warning. Remove runtime test of constant information. +2008-02-03 14:17:02 INFO: /Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua $ cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.21 Source/kwsys/SystemInformation.cxx +2008-02-03 14:17:02 DEBUG: Executing cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.21 Source/kwsys/SystemInformation.cxx ('/Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua') +2008-02-03 14:17:04 INFO: [Ok] +2008-02-03 14:17:04 DEBUG: Source/kwsys/SystemInformation.cxx updated to 1.21 +2008-02-03 14:17:04 INFO: Committing u'2008-02-03 13:14:38 by king'... +2008-02-03 14:17:04 INFO: -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +2008-02-03 14:17:04 INFO: Changeset #3 +2008-02-03 14:17:04 INFO: Changeset "2008-02-03 13:20:11 by king" +2008-02-03 14:17:04 INFO: Log message: COMP: Fix warning in SystemInformation.cxx about possibly incorrect assignment in if condition. +2008-02-03 14:17:04 DEBUG: Going to apply changeset: +Revision: 2008-02-03 13:20:11 by king +Date: 2008-02-03 13:20:11+00:00 +Author: king +Entries: Source/kwsys/SystemInformation.cxx(UPD to 1.22) +Log: COMP: Fix warning in SystemInformation.cxx about possibly incorrect assignment in if condition. +2008-02-03 14:17:04 INFO: /Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua $ cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.22 Source/kwsys/SystemInformation.cxx +2008-02-03 14:17:04 DEBUG: Executing cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.22 Source/kwsys/SystemInformation.cxx ('/Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua') +2008-02-03 14:17:06 INFO: [Ok] +2008-02-03 14:17:06 DEBUG: Source/kwsys/SystemInformation.cxx updated to 1.22 +2008-02-03 14:17:06 INFO: Committing u'2008-02-03 13:20:11 by king'... +2008-02-03 14:17:06 INFO: -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +2008-02-03 14:17:06 INFO: Changeset #4 +2008-02-03 14:17:06 INFO: Changeset "2008-02-03 13:57:41 by king" +2008-02-03 14:17:06 INFO: Log message: BUG: cmCTest::GetConfigType should return the string by reference-to-const so that callers may use .c_str() safely. +2008-02-03 14:17:06 DEBUG: Going to apply changeset: +Revision: 2008-02-03 13:57:41 by king +Date: 2008-02-03 13:57:41+00:00 +Author: king +Entries: Source/cmCTest.cxx(UPD to 1.334), Source/cmCTest.h(UPD to 1.100) +Log: BUG: cmCTest::GetConfigType should return the string by reference-to-const so that callers may use .c_str() safely. +2008-02-03 14:17:06 INFO: /Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua $ cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.100 Source/cmCTest.h +2008-02-03 14:17:06 DEBUG: Executing cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.100 Source/cmCTest.h ('/Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua') +2008-02-03 14:17:08 INFO: [Ok] +2008-02-03 14:17:08 DEBUG: Source/cmCTest.h updated to 1.100 +2008-02-03 14:17:08 INFO: /Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua $ cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.334 Source/cmCTest.cxx +2008-02-03 14:17:08 DEBUG: Executing cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.334 Source/cmCTest.cxx ('/Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua') +2008-02-03 14:17:09 INFO: [Ok] +2008-02-03 14:17:09 DEBUG: Source/cmCTest.cxx updated to 1.100 +2008-02-03 14:17:09 INFO: Committing u'2008-02-03 13:57:41 by king'... +2008-02-03 14:17:09 INFO: -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +2008-02-03 14:17:09 INFO: Changeset #5 +2008-02-03 14:17:09 INFO: Changeset "2008-02-03 13:57:58 by king" +2008-02-03 14:17:09 INFO: Log message: COMP: Convert C function prototypes to use (void) instead of (). +2008-02-03 14:17:09 DEBUG: Going to apply changeset: +Revision: 2008-02-03 13:57:58 by king +Date: 2008-02-03 13:57:58+00:00 +Author: king +Entries: Tests/ExportImport/Export/testExe1.c(UPD to 1.3), Tests/ExportImport/Export/testExe1lib.c(UPD to 1.2), Tests/ExportImport/Export/testLib1.c(UPD to 1.2), Tests/ExportImport/Export/testLib2.c(UPD to 1.2) +Log: COMP: Convert C function prototypes to use (void) instead of (). +2008-02-03 14:17:09 INFO: /Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua $ cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.2 Tests/ExportImport/Export/testExe1lib.c Tests/ExportImport/Export/testLib1.c Tests/ExportImport/Export/testLib2.c +2008-02-03 14:17:09 DEBUG: Executing cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.2 Tests/ExportImport/Export/testExe1lib.c Tests/ExportImport/Export/testLib1.c Tests/ExportImport/Export/testLib2.c ('/Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua') +2008-02-03 14:17:11 INFO: [Ok] +2008-02-03 14:17:11 DEBUG: Tests/ExportImport/Export/testExe1lib.c,Tests/ExportImport/Export/testLib1.c,Tests/ExportImport/Export/testLib2.c updated to 1.2 +2008-02-03 14:17:11 INFO: /Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua $ cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.3 Tests/ExportImport/Export/testExe1.c +2008-02-03 14:17:11 DEBUG: Executing cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.3 Tests/ExportImport/Export/testExe1.c ('/Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua') +2008-02-03 14:17:12 INFO: [Ok] +2008-02-03 14:17:12 DEBUG: Tests/ExportImport/Export/testExe1.c updated to 1.2 +2008-02-03 14:17:12 INFO: Committing u'2008-02-03 13:57:58 by king'... +2008-02-03 14:17:12 INFO: -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +2008-02-03 14:17:12 INFO: Changeset #6 +2008-02-03 14:17:12 INFO: Changeset "2008-02-03 13:58:10 by king" +2008-02-03 14:17:12 INFO: Log message: COMP: Avoid warning in kwsys IOStream.cxx when the helper functions are not needed. Define one public symbol to avoid complaints from archivers about empty object files. +2008-02-03 14:17:12 DEBUG: Going to apply changeset: +Revision: 2008-02-03 13:58:10 by king +Date: 2008-02-03 13:58:10+00:00 +Author: king +Entries: Source/kwsys/IOStream.cxx(UPD to 1.2) +Log: COMP: Avoid warning in kwsys IOStream.cxx when the helper functions are not needed. Define one public symbol to avoid complaints from archivers about empty object files. +2008-02-03 14:17:12 INFO: /Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua $ cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.2 Source/kwsys/IOStream.cxx +2008-02-03 14:17:12 DEBUG: Executing cvs -f -d :pserver:anonymous@www.cmake.org:/cvsroot/CMake -q update -d -r 1.2 Source/kwsys/IOStream.cxx ('/Users/ewing/Source/CMAKELUA/TAILOR/CMakeLua') +2008-02-03 14:17:14 INFO: [Ok] +2008-02-03 14:17:14 DEBUG: Source/kwsys/IOStream.cxx updated to 1.2 +2008-02-03 14:17:14 INFO: Committing u'2008-02-03 13:58:10 by king'... +2008-02-03 14:17:14 INFO: -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* +2008-02-03 14:17:14 DEBUG: Adjusting the state accordingly to journal +2008-02-03 14:17:14 INFO: Update completed, now at revision "2008-02-03 13:58:10 by king" diff --git a/tailor.state b/tailor.state index 064ab2e..999c7b2 100644 --- a/tailor.state +++ b/tailor.state @@ -11,7 +11,7 @@ NtRp4 (dp5 S'log' p6 -VSTYLE: Nightly Date Stamp +VCOMP: Avoid warning in kwsys IOStream.cxx when the helper functions are not needed. Define one public symbol to avoid complaints from archivers about empty object files. p7 sS'author' p8 @@ -27,7 +27,7 @@ p13 cdatetime datetime p14 -(S'\x07\xd8\x02\x03\x05\x01\x02\x00\x00\x00' +(S'\x07\xd8\x02\x03\r:\n\x00\x00\x00' cvcpx.tzinfo _UTC p15 @@ -49,12 +49,12 @@ NsS'old_revision' p24 NsS'name' p25 -VSource/kwsys/kwsysDateStamp.cmake +VSource/kwsys/IOStream.cxx p26 sg10 NsS'new_revision' p27 -V1.85 +V1.2 p28 sS'action_kind' p29 @@ -64,6 +64,6 @@ sS'old_name' p31 NsbasS'revision' p32 -V2008-02-03 05:01:02 by king +V2008-02-03 13:58:10 by king p33 sb.N. \ No newline at end of file diff --git a/tailor.state.old b/tailor.state.old index 93fed32..9a69fcf 100644 --- a/tailor.state.old +++ b/tailor.state.old @@ -11,11 +11,11 @@ NtRp4 (dp5 S'log' p6 -VENH: disable test for vs 70 as devenv randomly segfaults when building the sub-project +VSTYLE: Nightly Date Stamp p7 sS'author' p8 -Vmartink +Vking p9 sS'unidiff' p10 @@ -27,7 +27,7 @@ p13 cdatetime datetime p14 -(S'\x07\xd8\x02\x01\x15\x11\x06\x00\x00\x00' +(S'\x07\xd8\x02\x03\x05\x01\x02\x00\x00\x00' cvcpx.tzinfo _UTC p15 @@ -49,12 +49,12 @@ NsS'old_revision' p24 NsS'name' p25 -VTests/CMakeLists.txt +VSource/kwsys/kwsysDateStamp.cmake p26 sg10 NsS'new_revision' p27 -V1.47 +V1.85 p28 sS'action_kind' p29 @@ -64,7 +64,7 @@ sS'old_name' p31 NsbasS'revision' p32 -V2008-02-01 21:17:06 by martink +V2008-02-03 05:01:02 by king p33 sb.N.ccopy_reg _reconstructor @@ -79,7 +79,7 @@ NtRp4 (dp5 S'log' p6 -VSTYLE: Nightly Date Stamp +VCOMP: Remove inline keyword from forward declaration for VS9. p7 sS'author' p8 @@ -95,7 +95,7 @@ p13 cdatetime datetime p14 -(S'\x07\xd8\x02\x02\x05\x01\x05\x00\x00\x00' +(S'\x07\xd8\x02\x03\r\x07\x11\x00\x00\x00' cvcpx.tzinfo _UTC p15 @@ -117,12 +117,148 @@ NsS'old_revision' p24 NsS'name' p25 -VSource/kwsys/kwsysDateStamp.cmake +VSource/kwsys/hash_set.hxx.in +p26 +sg10 +NsS'new_revision' +p27 +V1.5 +p28 +sS'action_kind' +p29 +S'UPD' +p30 +sS'old_name' +p31 +NsbasS'revision' +p32 +V2008-02-03 13:07:17 by king +p33 +sb.ccopy_reg +_reconstructor +p1 +(cvcpx.changes +Changeset +p2 +c__builtin__ +object +p3 +NtRp4 +(dp5 +S'log' +p6 +VCOMP: Fix unreachable code warning. Remove runtime test of constant information. +p7 +sS'author' +p8 +Vking +p9 +sS'unidiff' +p10 +NsS'tags' +p11 +(lp12 +sS'_Changeset__date' +p13 +cdatetime +datetime +p14 +(S'\x07\xd8\x02\x03\r\x0e&\x00\x00\x00' +cvcpx.tzinfo +_UTC +p15 +(tRp16 +tRp17 +sS'entries' +p18 +(lp19 +g1 +(cvcpx.changes +ChangesetEntry +p20 +g3 +NtRp21 +(dp22 +S'status' +p23 +NsS'old_revision' +p24 +NsS'name' +p25 +VSource/kwsys/SystemInformation.cxx +p26 +sg10 +NsS'new_revision' +p27 +V1.21 +p28 +sS'action_kind' +p29 +S'UPD' +p30 +sS'old_name' +p31 +NsbasS'revision' +p32 +V2008-02-03 13:14:38 by king +p33 +sb.ccopy_reg +_reconstructor +p1 +(cvcpx.changes +Changeset +p2 +c__builtin__ +object +p3 +NtRp4 +(dp5 +S'log' +p6 +VCOMP: Fix warning in SystemInformation.cxx about possibly incorrect assignment in if condition. +p7 +sS'author' +p8 +Vking +p9 +sS'unidiff' +p10 +NsS'tags' +p11 +(lp12 +sS'_Changeset__date' +p13 +cdatetime +datetime +p14 +(S'\x07\xd8\x02\x03\r\x14\x0b\x00\x00\x00' +cvcpx.tzinfo +_UTC +p15 +(tRp16 +tRp17 +sS'entries' +p18 +(lp19 +g1 +(cvcpx.changes +ChangesetEntry +p20 +g3 +NtRp21 +(dp22 +S'status' +p23 +NsS'old_revision' +p24 +NsS'name' +p25 +VSource/kwsys/SystemInformation.cxx p26 sg10 NsS'new_revision' p27 -V1.84 +V1.22 p28 sS'action_kind' p29 @@ -132,7 +268,7 @@ sS'old_name' p31 NsbasS'revision' p32 -V2008-02-02 05:01:05 by king +V2008-02-03 13:20:11 by king p33 sb.ccopy_reg _reconstructor @@ -147,7 +283,7 @@ NtRp4 (dp5 S'log' p6 -VENH: Enable dependent library search paths on more platforms\u000A\u000A - NetBSD needs dependent library paths in -rpath-link option.\u000A - kFreeBSD needs dependent library paths in -rpath-link option. +VBUG: cmCTest::GetConfigType should return the string by reference-to-const so that callers may use .c_str() safely. p7 sS'author' p8 @@ -163,7 +299,7 @@ p13 cdatetime datetime p14 -(S'\x07\xd8\x02\x02\r:5\x00\x00\x00' +(S'\x07\xd8\x02\x03\r9)\x00\x00\x00' cvcpx.tzinfo _UTC p15 @@ -185,12 +321,12 @@ NsS'old_revision' p24 NsS'name' p25 -VModules/Platform/NetBSD.cmake +VSource/cmCTest.cxx p26 sg10 NsS'new_revision' p27 -V1.9 +V1.334 p28 sS'action_kind' p29 @@ -206,18 +342,18 @@ NtRp32 g23 Nsg24 Nsg25 -VModules/Platform/kFreeBSD.cmake +VSource/cmCTest.h p34 sg10 Nsg27 -V1.4 +V1.100 p35 sg29 g30 sg31 NsbasS'revision' p36 -V2008-02-02 13:58:53 by king +V2008-02-03 13:57:41 by king p37 sb.ccopy_reg _reconstructor @@ -232,11 +368,11 @@ NtRp4 (dp5 S'log' p6 -VENH: fix infinite loop from size_t change +VCOMP: Convert C function prototypes to use (void) instead of (). p7 sS'author' p8 -Vhoffman +Vking p9 sS'unidiff' p10 @@ -248,7 +384,7 @@ p13 cdatetime datetime p14 -(S'\x07\xd8\x02\x02\x15\x12#\x00\x00\x00' +(S'\x07\xd8\x02\x03\r9:\x00\x00\x00' cvcpx.tzinfo _UTC p15 @@ -270,12 +406,12 @@ NsS'old_revision' p24 NsS'name' p25 -VSource/kwsys/SystemInformation.cxx +VTests/ExportImport/Export/testExe1.c p26 sg10 NsS'new_revision' p27 -V1.20 +V1.3 p28 sS'action_kind' p29 @@ -283,10 +419,61 @@ S'UPD' p30 sS'old_name' p31 +Nsbag1 +(g20 +g3 +NtRp32 +(dp33 +g23 +Nsg24 +Nsg25 +VTests/ExportImport/Export/testExe1lib.c +p34 +sg10 +Nsg27 +V1.2 +p35 +sg29 +g30 +sg31 +Nsbag1 +(g20 +g3 +NtRp36 +(dp37 +g23 +Nsg24 +Nsg25 +VTests/ExportImport/Export/testLib1.c +p38 +sg10 +Nsg27 +V1.2 +p39 +sg29 +g30 +sg31 +Nsbag1 +(g20 +g3 +NtRp40 +(dp41 +g23 +Nsg24 +Nsg25 +VTests/ExportImport/Export/testLib2.c +p42 +sg10 +Nsg27 +V1.2 +p43 +sg29 +g30 +sg31 NsbasS'revision' -p32 -V2008-02-02 21:18:35 by hoffman -p33 +p44 +V2008-02-03 13:57:58 by king +p45 sb.ccopy_reg _reconstructor p1 @@ -300,7 +487,7 @@ NtRp4 (dp5 S'log' p6 -VSTYLE: Nightly Date Stamp +VCOMP: Avoid warning in kwsys IOStream.cxx when the helper functions are not needed. Define one public symbol to avoid complaints from archivers about empty object files. p7 sS'author' p8 @@ -316,7 +503,7 @@ p13 cdatetime datetime p14 -(S'\x07\xd8\x02\x03\x05\x01\x02\x00\x00\x00' +(S'\x07\xd8\x02\x03\r:\n\x00\x00\x00' cvcpx.tzinfo _UTC p15 @@ -338,12 +525,12 @@ NsS'old_revision' p24 NsS'name' p25 -VSource/kwsys/kwsysDateStamp.cmake +VSource/kwsys/IOStream.cxx p26 sg10 NsS'new_revision' p27 -V1.85 +V1.2 p28 sS'action_kind' p29 @@ -353,6 +540,6 @@ sS'old_name' p31 NsbasS'revision' p32 -V2008-02-03 05:01:02 by king +V2008-02-03 13:58:10 by king p33 sb. \ No newline at end of file -- 2.11.4.GIT