Menu
▾
▴
zoolib-checkins — CVS checkin messages are posted to this list as they occur.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
(25) |
Apr
(97) |
May
(56) |
Jun
(29) |
Jul
(65) |
Aug
(18) |
Sep
(14) |
Oct
(114) |
Nov
(12) |
Dec
(40) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(47) |
Mar
(109) |
Apr
(114) |
May
(47) |
Jun
(36) |
Jul
(8) |
Aug
(23) |
Sep
(111) |
Oct
(64) |
Nov
(57) |
Dec
(26) |
| 2004 |
Jan
(2) |
Feb
(18) |
Mar
(11) |
Apr
(1) |
May
(52) |
Jun
(70) |
Jul
(37) |
Aug
(24) |
Sep
(4) |
Oct
(27) |
Nov
(4) |
Dec
(29) |
| 2005 |
Jan
(8) |
Feb
(36) |
Mar
(71) |
Apr
(31) |
May
(42) |
Jun
(2) |
Jul
(53) |
Aug
(43) |
Sep
(41) |
Oct
(55) |
Nov
(59) |
Dec
(51) |
| 2006 |
Jan
(36) |
Feb
(36) |
Mar
(19) |
Apr
(85) |
May
(33) |
Jun
(10) |
Jul
(110) |
Aug
(44) |
Sep
(10) |
Oct
(123) |
Nov
(27) |
Dec
|
| 2007 |
Jan
(34) |
Feb
(16) |
Mar
(21) |
Apr
(53) |
May
(6) |
Jun
(8) |
Jul
(117) |
Aug
(10) |
Sep
(131) |
Oct
(13) |
Nov
(8) |
Dec
(46) |
| 2008 |
Jan
(47) |
Feb
(44) |
Mar
(66) |
Apr
(2) |
May
(29) |
Jun
(37) |
Jul
(13) |
Aug
(22) |
Sep
(32) |
Oct
(55) |
Nov
(60) |
Dec
(108) |
| 2009 |
Jan
(23) |
Feb
(103) |
Mar
(98) |
Apr
(21) |
May
(78) |
Jun
(141) |
Jul
(130) |
Aug
(60) |
Sep
(56) |
Oct
(51) |
Nov
(26) |
Dec
(17) |
| 2010 |
Jan
(48) |
Feb
(49) |
Mar
(42) |
Apr
(123) |
May
(38) |
Jun
(89) |
Jul
(34) |
Aug
(64) |
Sep
(31) |
Oct
(113) |
Nov
(20) |
Dec
(104) |
| 2011 |
Jan
(110) |
Feb
(70) |
Mar
(43) |
Apr
(30) |
May
(48) |
Jun
(115) |
Jul
(186) |
Aug
(17) |
Sep
(69) |
Oct
(77) |
Nov
(25) |
Dec
(25) |
| 2012 |
Jan
(49) |
Feb
(9) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ag...@us...> - 2012-01-06 04:12:02
|
Revision: 2661
http://zoolib.svn.sourceforge.net/zoolib/?rev=2661&view=rev
Author: agreen
Date: 2012-01-06 04:11:50 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
Make header guard macros of the form __ZXXX_h__ rather than __ZXXX___.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryCOM.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Dataspace.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceMUX.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceServer.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Asyncify.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Client.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_SQLite.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Util_Strim.h
trunk/zoolib/source/cxx/more/zoolib/datonset/ZDatonSet.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_AppleDouble.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_JPEG.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Val.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Yad.h
trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine.h
trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine_Geometry.h
trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine_Tweens.h
trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest_Std.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Cocoa.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Mac.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Win.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Macros.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Object.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_ObjectPriv.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Variant.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_VariantPriv.h
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop.h
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.h
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Util.h
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.h
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Yad.h
trunk/zoolib/source/cxx/more/zoolib/sqlite/ZSQLite.h
trunk/zoolib/source/cxx/more/zoolib/sqlite/ZSQLite_YadSeqR_Iter.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_DoQuery.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Result.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Transform_Search.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Visitor_DoMakeWalker.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Calc.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Const.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Dee.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Dum.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Embed.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Product.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Project.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Rename.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Restrict.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Result.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Union.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_AsSQL.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Intersect.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_GetRelHead.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelHead.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelName.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Transform_ConsolidateRenames.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Transform_DecomposeRestricts.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Transform_PushDownRestricts.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Util.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Util_RelOperators.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Util_Strim_Rel.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Util_Strim_RelHead.h
trunk/zoolib/source/cxx/old/zoolib/ZASCompiler.h
trunk/zoolib/source/cxx/old/zoolib/ZASParser.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset_FS.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset_MacOS.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset_POSIX.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset_Std.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset_Win.h
trunk/zoolib/source/cxx/old/zoolib/ZDC.h
trunk/zoolib/source/cxx/old/zoolib/ZDCGlyphServer.h
trunk/zoolib/source/cxx/old/zoolib/ZDCGlyphServer_Asset.h
trunk/zoolib/source/cxx/old/zoolib/ZDCInk.h
trunk/zoolib/source/cxx/old/zoolib/ZDCPixmapCombo.h
trunk/zoolib/source/cxx/old/zoolib/ZDCPixmap_Asset_BMP.h
trunk/zoolib/source/cxx/old/zoolib/ZDCPoly.h
trunk/zoolib/source/cxx/old/zoolib/ZDCRgn.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_GDI.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_X.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_ZooLib.h
trunk/zoolib/source/cxx/old/zoolib/ZMutexComposite.h
trunk/zoolib/source/cxx/old/zoolib/ZNode.h
trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h
trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Wrapper.h
trunk/zoolib/source/cxx/old/zoolib/ZNode_FS.h
trunk/zoolib/source/cxx/old/zoolib/ZProgressWatcher.h
trunk/zoolib/source/cxx/old/zoolib/ZStreamMUX.h
trunk/zoolib/source/cxx/old/zoolib/ZStream_JNI.h
trunk/zoolib/source/cxx/old/zoolib/ZTS_Umbrella.h
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Asset.h
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Graphics.h
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.h
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_LL.h
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Win_UI.h
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
trunk/zoolib/source/cxx/old/zoolib/ZWebDAV.h
trunk/zoolib/source/cxx/old/zoolib/ZXLib.h
trunk/zoolib/source/cxx/old/zoolib/ZXServer.h
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLib.h
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStream.h
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.h
trunk/zoolib/source/cxx/zoolib/ZAccumulator_T.h
trunk/zoolib/source/cxx/zoolib/ZAny.h
trunk/zoolib/source/cxx/zoolib/ZAtomic.h
trunk/zoolib/source/cxx/zoolib/ZBigRegion.h
trunk/zoolib/source/cxx/zoolib/ZBitStream.h
trunk/zoolib/source/cxx/zoolib/ZBlockStore.h
trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.h
trunk/zoolib/source/cxx/zoolib/ZByteSwap.h
trunk/zoolib/source/cxx/zoolib/ZCONFIG_API.h
trunk/zoolib/source/cxx/zoolib/ZCONFIG_API_Definitions.h
trunk/zoolib/source/cxx/zoolib/ZCONFIG_SPI.h
trunk/zoolib/source/cxx/zoolib/ZCONFIG_SPI_Definitions.h
trunk/zoolib/source/cxx/zoolib/ZCallByCaller.h
trunk/zoolib/source/cxx/zoolib/ZCallScheduler.h
trunk/zoolib/source/cxx/zoolib/ZCallable.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Bind.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Block.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Bool.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Caller.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Compound.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Const.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Delay.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Function.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Indirect.h
trunk/zoolib/source/cxx/zoolib/ZCallable_ObjC.h
trunk/zoolib/source/cxx/zoolib/ZCallable_PMF.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Set.h
trunk/zoolib/source/cxx/zoolib/ZCaller.h
trunk/zoolib/source/cxx/zoolib/ZCaller_CFRunLoop.h
trunk/zoolib/source/cxx/zoolib/ZCaller_CarbonEvents.h
trunk/zoolib/source/cxx/zoolib/ZCaller_EventLoop.h
trunk/zoolib/source/cxx/zoolib/ZCaller_Thread.h
trunk/zoolib/source/cxx/zoolib/ZCaller_WinMessageLoop.h
trunk/zoolib/source/cxx/zoolib/ZCog.h
trunk/zoolib/source/cxx/zoolib/ZCog_Std.h
trunk/zoolib/source/cxx/zoolib/ZCommandLine.h
trunk/zoolib/source/cxx/zoolib/ZCommandLine_TValue.h
trunk/zoolib/source/cxx/zoolib/ZCompare.h
trunk/zoolib/source/cxx/zoolib/ZCompare_Integer.h
trunk/zoolib/source/cxx/zoolib/ZCompare_Real.h
trunk/zoolib/source/cxx/zoolib/ZCompare_Ref.h
trunk/zoolib/source/cxx/zoolib/ZCompare_String.h
trunk/zoolib/source/cxx/zoolib/ZCompare_T.h
trunk/zoolib/source/cxx/zoolib/ZCompare_Vector.h
trunk/zoolib/source/cxx/zoolib/ZCompat_GdiPlus.h
trunk/zoolib/source/cxx/zoolib/ZCompat_MSVCStaticLib.h
trunk/zoolib/source/cxx/zoolib/ZCompat_NSObject.h
trunk/zoolib/source/cxx/zoolib/ZCompat_NonCopyable.h
trunk/zoolib/source/cxx/zoolib/ZCompat_Win.h
trunk/zoolib/source/cxx/zoolib/ZCompat_Xlib.h
trunk/zoolib/source/cxx/zoolib/ZCompat_algorithm.h
trunk/zoolib/source/cxx/zoolib/ZCompat_cmath.h
trunk/zoolib/source/cxx/zoolib/ZCompat_operator_bool.h
trunk/zoolib/source/cxx/zoolib/ZCompat_string.h
trunk/zoolib/source/cxx/zoolib/ZCounted.h
trunk/zoolib/source/cxx/zoolib/ZCountedVal.h
trunk/zoolib/source/cxx/zoolib/ZCountedWithoutFinalize.h
trunk/zoolib/source/cxx/zoolib/ZCtorDtor.h
trunk/zoolib/source/cxx/zoolib/ZDCFont.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmap.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapBlit.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapBlitPriv.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_GIF.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_PNG.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmap_CoreVideo.h
trunk/zoolib/source/cxx/zoolib/ZDList.h
trunk/zoolib/source/cxx/zoolib/ZData_Any.h
trunk/zoolib/source/cxx/zoolib/ZData_CF.h
trunk/zoolib/source/cxx/zoolib/ZData_NS.h
trunk/zoolib/source/cxx/zoolib/ZDebug.h
trunk/zoolib/source/cxx/zoolib/ZDelegate.h
trunk/zoolib/source/cxx/zoolib/ZExpr.h
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.h
trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h
trunk/zoolib/source/cxx/zoolib/ZFile.h
trunk/zoolib/source/cxx/zoolib/ZFile_POSIX.h
trunk/zoolib/source/cxx/zoolib/ZFile_Win.h
trunk/zoolib/source/cxx/zoolib/ZFunctionChain.h
trunk/zoolib/source/cxx/zoolib/ZGRgn.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_BigRegion.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_HRGN.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_RgnHandle.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_XRegion.h
trunk/zoolib/source/cxx/zoolib/ZGeom.h
trunk/zoolib/source/cxx/zoolib/ZGeomPOD.h
trunk/zoolib/source/cxx/zoolib/ZGeometry.h
trunk/zoolib/source/cxx/zoolib/ZGetSet.h
trunk/zoolib/source/cxx/zoolib/ZHTTP.h
trunk/zoolib/source/cxx/zoolib/ZHTTP_Requests.h
trunk/zoolib/source/cxx/zoolib/ZHandle_T.h
trunk/zoolib/source/cxx/zoolib/ZIntervalTreeClock.h
trunk/zoolib/source/cxx/zoolib/ZLog.h
trunk/zoolib/source/cxx/zoolib/ZMACRO_typeof.h
trunk/zoolib/source/cxx/zoolib/ZMIME.h
trunk/zoolib/source/cxx/zoolib/ZML.h
trunk/zoolib/source/cxx/zoolib/ZMacCFM.h
trunk/zoolib/source/cxx/zoolib/ZMacFixup.h
trunk/zoolib/source/cxx/zoolib/ZMacOSX.h
trunk/zoolib/source/cxx/zoolib/ZMain.h
trunk/zoolib/source/cxx/zoolib/ZMap_CFPreferences.h
trunk/zoolib/source/cxx/zoolib/ZMatrix.h
trunk/zoolib/source/cxx/zoolib/ZMemory.h
trunk/zoolib/source/cxx/zoolib/ZMulti_T.h
trunk/zoolib/source/cxx/zoolib/ZNatter.h
trunk/zoolib/source/cxx/zoolib/ZNet.h
trunk/zoolib/source/cxx/zoolib/ZNetDNSSD.h
trunk/zoolib/source/cxx/zoolib/ZNet_AppleTalk.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_Socket.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_WinSock.h
trunk/zoolib/source/cxx/zoolib/ZNet_Local.h
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Socket.h
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.h
trunk/zoolib/source/cxx/zoolib/ZNet_RFCOMM.h
trunk/zoolib/source/cxx/zoolib/ZNet_RFCOMM_OSX.h
trunk/zoolib/source/cxx/zoolib/ZNet_Socket.h
trunk/zoolib/source/cxx/zoolib/ZObjC.h
trunk/zoolib/source/cxx/zoolib/ZObserver.h
trunk/zoolib/source/cxx/zoolib/ZPromise.h
trunk/zoolib/source/cxx/zoolib/ZQ.h
trunk/zoolib/source/cxx/zoolib/ZRGBA.h
trunk/zoolib/source/cxx/zoolib/ZRGBColor.h
trunk/zoolib/source/cxx/zoolib/ZRef.h
trunk/zoolib/source/cxx/zoolib/ZRef_CF.h
trunk/zoolib/source/cxx/zoolib/ZRef_NS.h
trunk/zoolib/source/cxx/zoolib/ZRef_WinHANDLE.h
trunk/zoolib/source/cxx/zoolib/ZRoster.h
trunk/zoolib/source/cxx/zoolib/ZSOCKS.h
trunk/zoolib/source/cxx/zoolib/ZSafe.h
trunk/zoolib/source/cxx/zoolib/ZSafeSet.h
trunk/zoolib/source/cxx/zoolib/ZSaveRestore_T.h
trunk/zoolib/source/cxx/zoolib/ZServer.h
trunk/zoolib/source/cxx/zoolib/ZSetRestore_T.h
trunk/zoolib/source/cxx/zoolib/ZSet_T.h
trunk/zoolib/source/cxx/zoolib/ZStackCrawl.h
trunk/zoolib/source/cxx/zoolib/ZStdIO.h
trunk/zoolib/source/cxx/zoolib/ZStdInt.h
trunk/zoolib/source/cxx/zoolib/ZStream.h
trunk/zoolib/source/cxx/zoolib/ZStreamRPos_StreamR.h
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_MemoryPipe.h
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_OpenSSL.h
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_SSL_OSX.h
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_SSL_Win.h
trunk/zoolib/source/cxx/zoolib/ZStreamRWPos_RAM.h
trunk/zoolib/source/cxx/zoolib/ZStreamRW_FIFO.h
trunk/zoolib/source/cxx/zoolib/ZStreamRW_FlushOnRead.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_Boundary.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_Cat.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_HexStrim.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_Random.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_SkipAllOnDestroy.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_Source.h
trunk/zoolib/source/cxx/zoolib/ZStreamW_Fragmented.h
trunk/zoolib/source/cxx/zoolib/ZStreamW_HexStrim.h
trunk/zoolib/source/cxx/zoolib/ZStream_ASCIIStrim.h
trunk/zoolib/source/cxx/zoolib/ZStream_Base64.h
trunk/zoolib/source/cxx/zoolib/ZStream_Buffered.h
trunk/zoolib/source/cxx/zoolib/ZStream_CFData.h
trunk/zoolib/source/cxx/zoolib/ZStream_CFStream.h
trunk/zoolib/source/cxx/zoolib/ZStream_CGData.h
trunk/zoolib/source/cxx/zoolib/ZStream_CRLF.h
trunk/zoolib/source/cxx/zoolib/ZStream_Chunked.h
trunk/zoolib/source/cxx/zoolib/ZStream_Compressed.h
trunk/zoolib/source/cxx/zoolib/ZStream_Count.h
trunk/zoolib/source/cxx/zoolib/ZStream_Data_T.h
trunk/zoolib/source/cxx/zoolib/ZStream_Filter.h
trunk/zoolib/source/cxx/zoolib/ZStream_LZW.h
trunk/zoolib/source/cxx/zoolib/ZStream_Limited.h
trunk/zoolib/source/cxx/zoolib/ZStream_MD5.h
trunk/zoolib/source/cxx/zoolib/ZStream_Mac.h
trunk/zoolib/source/cxx/zoolib/ZStream_Memory.h
trunk/zoolib/source/cxx/zoolib/ZStream_NSData.h
trunk/zoolib/source/cxx/zoolib/ZStream_POSIX.h
trunk/zoolib/source/cxx/zoolib/ZStream_PageBuffered.h
trunk/zoolib/source/cxx/zoolib/ZStream_RateCapped.h
trunk/zoolib/source/cxx/zoolib/ZStream_SHA1.h
trunk/zoolib/source/cxx/zoolib/ZStream_String.h
trunk/zoolib/source/cxx/zoolib/ZStream_Tee.h
trunk/zoolib/source/cxx/zoolib/ZStream_Win.h
trunk/zoolib/source/cxx/zoolib/ZStream_ZLib.h
trunk/zoolib/source/cxx/zoolib/ZStream_bzip2.h
trunk/zoolib/source/cxx/zoolib/ZStreamer.h
trunk/zoolib/source/cxx/zoolib/ZStreamerFactory_Precon.h
trunk/zoolib/source/cxx/zoolib/ZStreamerRPos_StreamR.h
trunk/zoolib/source/cxx/zoolib/ZStreamerRWCon_SSL.h
trunk/zoolib/source/cxx/zoolib/ZStreamerRWFactory_Buffered.h
trunk/zoolib/source/cxx/zoolib/ZStreamerRWFactory_Fallback.h
trunk/zoolib/source/cxx/zoolib/ZStreamerRWFactory_Retry.h
trunk/zoolib/source/cxx/zoolib/ZStrim.h
trunk/zoolib/source/cxx/zoolib/ZStrimR_Boundary.h
trunk/zoolib/source/cxx/zoolib/ZStrimR_Rewind.h
trunk/zoolib/source/cxx/zoolib/ZStrimU_Std.h
trunk/zoolib/source/cxx/zoolib/ZStrimU_StreamUTF8Buffered.h
trunk/zoolib/source/cxx/zoolib/ZStrimU_Unreader.h
trunk/zoolib/source/cxx/zoolib/ZStrimW_WinDebug.h
trunk/zoolib/source/cxx/zoolib/ZStrim_CFString.h
trunk/zoolib/source/cxx/zoolib/ZStrim_CRLF.h
trunk/zoolib/source/cxx/zoolib/ZStrim_Escaped.h
trunk/zoolib/source/cxx/zoolib/ZStrim_Limited.h
trunk/zoolib/source/cxx/zoolib/ZStrim_NSString.h
trunk/zoolib/source/cxx/zoolib/ZStrim_Stream.h
trunk/zoolib/source/cxx/zoolib/ZStrim_Tee.h
trunk/zoolib/source/cxx/zoolib/ZStrimmer.h
trunk/zoolib/source/cxx/zoolib/ZStrimmer_Stream.h
trunk/zoolib/source/cxx/zoolib/ZStrimmer_Streamer.h
trunk/zoolib/source/cxx/zoolib/ZString.h
trunk/zoolib/source/cxx/zoolib/ZTName.h
trunk/zoolib/source/cxx/zoolib/ZTagVal.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_ICU.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Mac.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Std.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Unicode.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Win.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_iconv.h
trunk/zoolib/source/cxx/zoolib/ZTextCollator.h
trunk/zoolib/source/cxx/zoolib/ZTextCollator_ASCII.h
trunk/zoolib/source/cxx/zoolib/ZTextCollator_ICU.h
trunk/zoolib/source/cxx/zoolib/ZThread.h
trunk/zoolib/source/cxx/zoolib/ZThreadSafe.h
trunk/zoolib/source/cxx/zoolib/ZThreadVal.h
trunk/zoolib/source/cxx/zoolib/ZThread_MacMP.h
trunk/zoolib/source/cxx/zoolib/ZThread_T.h
trunk/zoolib/source/cxx/zoolib/ZThread_Win.h
trunk/zoolib/source/cxx/zoolib/ZThread_boost.h
trunk/zoolib/source/cxx/zoolib/ZThread_pthread.h
trunk/zoolib/source/cxx/zoolib/ZTime.h
trunk/zoolib/source/cxx/zoolib/ZTrail.h
trunk/zoolib/source/cxx/zoolib/ZTween.h
trunk/zoolib/source/cxx/zoolib/ZTween_Std.h
trunk/zoolib/source/cxx/zoolib/ZTxn.h
trunk/zoolib/source/cxx/zoolib/ZTypes.h
trunk/zoolib/source/cxx/zoolib/ZUSB_OSX.h
trunk/zoolib/source/cxx/zoolib/ZUniSet_T.h
trunk/zoolib/source/cxx/zoolib/ZUnicode.h
trunk/zoolib/source/cxx/zoolib/ZUnicodeCU.h
trunk/zoolib/source/cxx/zoolib/ZUnicodePriv.h
trunk/zoolib/source/cxx/zoolib/ZUnicodePrivB.h
trunk/zoolib/source/cxx/zoolib/ZUnicodeString.h
trunk/zoolib/source/cxx/zoolib/ZUnicode_Normalize.h
trunk/zoolib/source/cxx/zoolib/ZUnicode_Normalize_CF.h
trunk/zoolib/source/cxx/zoolib/ZUnicode_Normalize_ICU.h
trunk/zoolib/source/cxx/zoolib/ZUnicode_Normalize_Win.h
trunk/zoolib/source/cxx/zoolib/ZUtil_ATSUI.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h
trunk/zoolib/source/cxx/zoolib/ZUtil_AppleEvent.h
trunk/zoolib/source/cxx/zoolib/ZUtil_CF.h
trunk/zoolib/source/cxx/zoolib/ZUtil_CF_Context.h
trunk/zoolib/source/cxx/zoolib/ZUtil_CarbonEvents.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Debug.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Expr_Bool_CNF.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Expr_Bool_ValPred_Rename.h
trunk/zoolib/source/cxx/zoolib/ZUtil_MacOSX.h
trunk/zoolib/source/cxx/zoolib/ZUtil_NS.h
trunk/zoolib/source/cxx/zoolib/ZUtil_POSIXFD.h
trunk/zoolib/source/cxx/zoolib/ZUtil_STL.h
trunk/zoolib/source/cxx/zoolib/ZUtil_STL_map.h
trunk/zoolib/source/cxx/zoolib/ZUtil_STL_set.h
trunk/zoolib/source/cxx/zoolib/ZUtil_STL_vector.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_Data.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_Geom.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_IntervalTreeClock.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_Matrix.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_Operators.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_ValPred_Any.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strimmer.h
trunk/zoolib/source/cxx/zoolib/ZUtil_SystemConfiguration.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Time.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Win.h
trunk/zoolib/source/cxx/zoolib/ZUtil_WinFile.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Yad.h
trunk/zoolib/source/cxx/zoolib/ZUtil_string.h
trunk/zoolib/source/cxx/zoolib/ZVal.h
trunk/zoolib/source/cxx/zoolib/ZValAccessors.h
trunk/zoolib/source/cxx/zoolib/ZValAccessors_Std.h
trunk/zoolib/source/cxx/zoolib/ZValPred.h
trunk/zoolib/source/cxx/zoolib/ZValPred_Any.h
trunk/zoolib/source/cxx/zoolib/ZValPred_GetNames.h
trunk/zoolib/source/cxx/zoolib/ZValPred_Rename.h
trunk/zoolib/source/cxx/zoolib/ZVal_Any.h
trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.h
trunk/zoolib/source/cxx/zoolib/ZVal_CF.h
trunk/zoolib/source/cxx/zoolib/ZVal_NS.h
trunk/zoolib/source/cxx/zoolib/ZVal_Yad.h
trunk/zoolib/source/cxx/zoolib/ZVisitor.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Do_T.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_Do_Eval.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ToStrim.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ValPred_Any_Do_Eval_Matches.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ValPred_Any_ToStrim.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ValPred_Do_GetNames.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Op_Do_Transform_T.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_ToStrim.h
trunk/zoolib/source/cxx/zoolib/ZWND.h
trunk/zoolib/source/cxx/zoolib/ZWinCOM.h
trunk/zoolib/source/cxx/zoolib/ZWinCOM_Macros.h
trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Val.h
trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Yad.h
trunk/zoolib/source/cxx/zoolib/ZWinService.h
trunk/zoolib/source/cxx/zoolib/ZWinWND.h
trunk/zoolib/source/cxx/zoolib/ZWorker.h
trunk/zoolib/source/cxx/zoolib/ZYad.h
trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h
trunk/zoolib/source/cxx/zoolib/ZYadTree.h
trunk/zoolib/source/cxx/zoolib/ZYad_Any.h
trunk/zoolib/source/cxx/zoolib/ZYad_AppleEvent.h
trunk/zoolib/source/cxx/zoolib/ZYad_Basic.h
trunk/zoolib/source/cxx/zoolib/ZYad_Bencode.h
trunk/zoolib/source/cxx/zoolib/ZYad_CF.h
trunk/zoolib/source/cxx/zoolib/ZYad_DividedValues.h
trunk/zoolib/source/cxx/zoolib/ZYad_FS.h
trunk/zoolib/source/cxx/zoolib/ZYad_JSON.h
trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.h
trunk/zoolib/source/cxx/zoolib/ZYad_ML.h
trunk/zoolib/source/cxx/zoolib/ZYad_MapAsSeq.h
trunk/zoolib/source/cxx/zoolib/ZYad_NS.h
trunk/zoolib/source/cxx/zoolib/ZYad_Simple.h
trunk/zoolib/source/cxx/zoolib/ZYad_Std.h
trunk/zoolib/source/cxx/zoolib/ZYad_Val_T.h
trunk/zoolib/source/cxx/zoolib/ZYad_XMLAttr.h
trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.h
trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.h
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZBlackBerry__
-#define __ZBlackBerry__ 1
+#ifndef __ZBlackBerry_h__
+#define __ZBlackBerry_h__ 1
#include "zconfig.h"
#include "zoolib/ZCallable.h"
@@ -133,4 +133,4 @@
} // namespace ZBlackBerry
} // namespace ZooLib
-#endif // __ZBlackBerry__
+#endif // __ZBlackBerry_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryCOM.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryCOM.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryCOM.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZBlackBerryCOM__
-#define __ZBlackBerryCOM__ 1
+#ifndef __ZBlackBerryCOM_h__
+#define __ZBlackBerryCOM_h__ 1
#include "zconfig.h"
#include "zoolib/ZCONFIG_SPI.h"
@@ -169,4 +169,4 @@
#endif // ZCONFIG_SPI_Enabled(Win)
-#endif // __ZBlackBerryCOM__
+#endif // __ZBlackBerryCOM_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZBlackBerry_Server__
-#define __ZBlackBerry_Server__ 1
+#ifndef __ZBlackBerry_Server_h__
+#define __ZBlackBerry_Server_h__ 1
#include "zconfig.h"
#include "zoolib/blackberry/ZBlackBerry.h"
@@ -75,4 +75,4 @@
} // namespace ZooLib
-#endif // __ZBlackBerry_Server__
+#endif // __ZBlackBerry_Server_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZBlackBerry_BBDevMgr__
-#define __ZBlackBerry_BBDevMgr__ 1
+#ifndef __ZBlackBerry_BBDevMgr_h__
+#define __ZBlackBerry_BBDevMgr_h__ 1
#include "zconfig.h"
#include "zoolib/ZCONFIG_API.h"
#include "zoolib/ZCONFIG_SPI.h"
@@ -99,4 +99,4 @@
#endif // ZCONFIG_API_Enabled(BlackBerry_BBDevMgr)
-#endif // __ZBlackBerry_BBDevMgr__
+#endif // __ZBlackBerry_BBDevMgr_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZBlackBerry_Client__
-#define __ZBlackBerry_Client__ 1
+#ifndef __ZBlackBerry_Client_h__
+#define __ZBlackBerry_Client_h__ 1
#include "zconfig.h"
#include "zoolib/blackberry/ZBlackBerry.h"
@@ -66,4 +66,4 @@
} // namespace ZBlackBerry
} // namespace ZooLib
-#endif // __ZBlackBerry_Client__
+#endif // __ZBlackBerry_Client_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZBlackBerry_OSXUSB__
-#define __ZBlackBerry_OSXUSB__ 1
+#ifndef __ZBlackBerry_OSXUSB_h__
+#define __ZBlackBerry_OSXUSB_h__ 1
#include "zconfig.h"
#include "zoolib/ZCONFIG_API.h"
#include "zoolib/ZCONFIG_SPI.h"
@@ -112,4 +112,4 @@
#endif // ZCONFIG_API_Enabled(BlackBerry_OSXUSB)
-#endif // __ZBlackBerry_OSXUSB__
+#endif // __ZBlackBerry_OSXUSB_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZBlackBerry_Streamer__
-#define __ZBlackBerry_Streamer__ 1
+#ifndef __ZBlackBerry_Streamer_h__
+#define __ZBlackBerry_Streamer_h__ 1
#include "zconfig.h"
#include "zoolib/ZCommer.h"
@@ -63,4 +63,4 @@
} // namespace ZBlackBerry
} // namespace ZooLib
-#endif // __ZBlackBerry_Streamer__
+#endif // __ZBlackBerry_Streamer_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZBlackBerry_Union__
-#define __ZBlackBerry_Union__ 1
+#ifndef __ZBlackBerry_Union_h__
+#define __ZBlackBerry_Union_h__ 1
#include "zconfig.h"
#include "zoolib/blackberry/ZBlackBerry.h"
@@ -69,4 +69,4 @@
} // namespace ZBlackBerry
} // namespace ZooLib
-#endif // __ZBlackBerry_OSXUSB__
+#endif // __ZBlackBerry_OSXUSB_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZUtil_BlackBerry__
-#define __ZUtil_BlackBerry__ 1
+#ifndef __ZUtil_BlackBerry_h__
+#define __ZUtil_BlackBerry_h__ 1
#include "zconfig.h"
#include "zoolib/blackberry/ZBlackBerry.h"
@@ -37,4 +37,4 @@
} // namespace ZUtil_BlackBerry
} // namespace ZooLib
-#endif // __ZUtil_BlackBerry__
+#endif // __ZUtil_BlackBerry_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Dataspace.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Dataspace.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Dataspace.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZDataspace_Dataspace__
-#define __ZDataspace_Dataspace__ 1
+#ifndef __ZDataspace_Dataspace_h__
+#define __ZDataspace_Dataspace_h__ 1
#include "zconfig.h"
#include "zoolib/ZThread.h"
@@ -141,4 +141,4 @@
} // namespace ZDataspace
} // namespace ZooLib
-#endif // __ZDataspace_Dataspace__
+#endif // __ZDataspace_Dataspace_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZDataspace_Source__
-#define __ZDataspace_Source__ 1
+#ifndef __ZDataspace_Source_h__
+#define __ZDataspace_Source_h__ 1
#include "zconfig.h"
#include "zoolib/ZCallable.h"
@@ -137,4 +137,4 @@
} // namespace ZDataspace
} // namespace ZooLib
-#endif // __ZDataspace_Source__
+#endif // __ZDataspace_Source_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceMUX.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceMUX.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceMUX.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZDataspace_SourceMUX__
-#define __ZDataspace_SourceMUX__ 1
+#ifndef __ZDataspace_SourceMUX_h__
+#define __ZDataspace_SourceMUX_h__ 1
#include "zconfig.h"
#include "zoolib/dataspace/ZDataspace_Source.h"
@@ -81,4 +81,4 @@
} // namespace ZDataspace
} // namespace ZooLib
-#endif // __ZDataspace_SourceMUX__
+#endif // __ZDataspace_SourceMUX_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceServer.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceServer.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceServer.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZDataspace_SourceServer__
-#define __ZDataspace_SourceServer__ 1
+#ifndef __ZDataspace_SourceServer_h__
+#define __ZDataspace_SourceServer_h__ 1
#include "zconfig.h"
#include "zoolib/ZStreamer.h"
@@ -57,4 +57,4 @@
} // namespace ZDataspace
} // namespace ZooLib
-#endif // __ZDataspace_SourceServer__
+#endif // __ZDataspace_SourceServer_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Asyncify.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Asyncify.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Asyncify.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZDataspace_Source_Asyncify__
-#define __ZDataspace_Source_Asyncify__ 1
+#ifndef __ZDataspace_Source_Asyncify_h__
+#define __ZDataspace_Source_Asyncify_h__ 1
#include "zconfig.h"
#include "zoolib/ZStreamer.h"
@@ -80,4 +80,4 @@
} // namespace ZDataspace
} // namespace ZooLib
-#endif // __ZDataspace_Source_Asyncify__
+#endif // __ZDataspace_Source_Asyncify_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Client.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Client.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Client.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZDataspace_Source_Client__
-#define __ZDataspace_Source_Client__ 1
+#ifndef __ZDataspace_Source_Client_h__
+#define __ZDataspace_Source_Client_h__ 1
#include "zconfig.h"
#include "zoolib/ZStreamer.h"
@@ -72,4 +72,4 @@
} // namespace ZDataspace
} // namespace ZooLib
-#endif // __ZDataspace_Source_Client__
+#endif // __ZDataspace_Source_Client_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZDataspace_Source_DatonSet__
-#define __ZDataspace_Source_DatonSet__ 1
+#ifndef __ZDataspace_Source_DatonSet_h__
+#define __ZDataspace_Source_DatonSet_h__ 1
#include "zconfig.h"
#include "zoolib/ZCompare_Ref.h"
@@ -179,4 +179,4 @@
} // namespace ZDataspace
} // namespace ZooLib
-#endif // __ZDataspace_Source_DatonSet__
+#endif // __ZDataspace_Source_DatonSet_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_SQLite.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_SQLite.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_SQLite.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZDataspace_Source_SQLite__
-#define __ZDataspace_Source_SQLite__ 1
+#ifndef __ZDataspace_Source_SQLite_h__
+#define __ZDataspace_Source_SQLite_h__ 1
#include "zconfig.h"
#include "zoolib/dataspace/ZDataspace_Source.h"
@@ -67,4 +67,4 @@
} // namespace ZDataspace
} // namespace ZooLib
-#endif // __ZDataspace_Source_SQLite__
+#endif // __ZDataspace_Source_SQLite_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZDataspace_Source_Union__
-#define __ZDataspace_Source_Union__ 1
+#ifndef __ZDataspace_Source_Union_h__
+#define __ZDataspace_Source_Union_h__ 1
#include "zconfig.h"
#include "zoolib/ZDList.h"
@@ -156,4 +156,4 @@
} // namespace ZDataspace
} // namespace ZooLib
-#endif // __ZDataspace_Source_Union__
+#endif // __ZDataspace_Source_Union_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Util_Strim.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Util_Strim.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Util_Strim.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZDataspace_Util_Strim__
-#define __ZDataspace_Util_Strim__
+#ifndef __ZDataspace_Util_Strim_h__
+#define __ZDataspace_Util_Strim_h__
#include "zconfig.h"
#include "zoolib/ZStrim.h"
@@ -38,4 +38,4 @@
} // namespace ZDataspace
} // namespace ZooLib
-#endif // __ZDataspace_Util_Strim__
+#endif // __ZDataspace_Util_Strim_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/datonset/ZDatonSet.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/datonset/ZDatonSet.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/datonset/ZDatonSet.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZDatonSet__
-#define __ZDatonSet__ 1
+#ifndef __ZDatonSet_h__
+#define __ZDatonSet_h__ 1
#include "zconfig.h"
#include "zoolib/ZData_Any.h"
@@ -212,4 +212,4 @@
} // namespace ZDatonSet
} // namespace ZooLib
-#endif // __ZDatonSet__
+#endif // __ZDatonSet_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_AppleDouble.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_AppleDouble.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_AppleDouble.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZFileFormat_AppleDouble__
-#define __ZFileFormat_AppleDouble__ 1
+#ifndef __ZFileFormat_AppleDouble_h__
+#define __ZFileFormat_AppleDouble_h__ 1
#include "zconfig.h"
#include "zoolib/ZStreamer.h"
@@ -80,4 +80,4 @@
} // namespace FileFormat
} // namespace ZooLib
-#endif // __ZFileFormat_AppleDouble__
+#endif // __ZFileFormat_AppleDouble_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZFileFormat_IFF__
-#define __ZFileFormat_IFF__ 1
+#ifndef __ZFileFormat_IFF_h__
+#define __ZFileFormat_IFF_h__ 1
#include "zconfig.h"
#include "zoolib/ZStream.h"
@@ -172,4 +172,4 @@
} // namespace FileFormat
} // namespace ZooLib
-#endif // __ZFileFormat_IFF__
+#endif // __ZFileFormat_IFF_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_JPEG.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_JPEG.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_JPEG.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZFileFormat_JPEG__
-#define __ZFileFormat_JPEG__ 1
+#ifndef __ZFileFormat_JPEG_h__
+#define __ZFileFormat_JPEG_h__ 1
#include "zconfig.h"
#include "zoolib/ZStream.h"
@@ -157,4 +157,4 @@
} // namespace FileFormat
} // namespace ZooLib
-#endif // __ZFileFormat_JPEG__
+#endif // __ZFileFormat_JPEG_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZFileFormat_QuickTime__
-#define __ZFileFormat_QuickTime__ 1
+#ifndef __ZFileFormat_QuickTime_h__
+#define __ZFileFormat_QuickTime_h__ 1
#include "zconfig.h"
#include "zoolib/ZStream.h"
@@ -158,4 +158,4 @@
} // namespace FileFormat
} // namespace ZooLib
-#endif // __ZFileFormat_QuickTime__
+#endif // __ZFileFormat_QuickTime_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Val.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Val.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Val.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZFileFormat_QuickTime_Val__
-#define __ZFileFormat_QuickTime_Val__ 1
+#ifndef __ZFileFormat_QuickTime_Val_h__
+#define __ZFileFormat_QuickTime_Val_h__ 1
#include "zconfig.h"
#include "zoolib/ZTagVal.h"
@@ -47,4 +47,4 @@
} // namespace FileFormat
} // namespace ZooLib
-#endif // __ZFileFormat_QuickTime_Val__
+#endif // __ZFileFormat_QuickTime_Val_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Yad.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Yad.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Yad.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZFileFormat_QuickTime_Yad__
-#define __ZFileFormat_QuickTime_Yad__ 1
+#ifndef __ZFileFormat_QuickTime_Yad_h__
+#define __ZFileFormat_QuickTime_Yad_h__ 1
#include "zconfig.h"
#include "zoolib/ZYad_Std.h"
@@ -38,4 +38,4 @@
} // namespace FileFormat
} // namespace ZooLib
-#endif // __ZFileFormat_QuickTime_Yad__
+#endif // __ZFileFormat_QuickTime_Yad_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZGameEngine__
-#define __ZGameEngine__ 1
+#ifndef __ZGameEngine_h__
+#define __ZGameEngine_h__ 1
#include "zconfig.h"
namespace ZooLib {
@@ -32,4 +32,4 @@
} // namespace ZGameEngine
} // namespace ZooLib
-#endif // __ZGameEngine__
+#endif // __ZGameEngine_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine_Geometry.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine_Geometry.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine_Geometry.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZGameEngine_Geometry__
-#define __ZGameEngine_Geometry__ 1
+#ifndef __ZGameEngine_Geometry_h__
+#define __ZGameEngine_Geometry_h__ 1
#include "zconfig.h"
#include "zoolib/ZMatrix.h"
@@ -286,4 +286,4 @@
} // namespace ZGameEngine
} // namespace ZooLib
-#endif // __ZGameEngine_Geometry__
+#endif // __ZGameEngine_Geometry_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine_Tweens.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine_Tweens.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine_Tweens.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZGameEngine_Tweens__
-#define __ZGameEngine_Tweens__ 1
+#ifndef __ZGameEngine_Tweens_h__
+#define __ZGameEngine_Tweens_h__ 1
#include "zconfig.h"
#include "zoolib/ZCompat_algorithm.h"
@@ -152,4 +152,4 @@
} // namespace ZGameEngine
} // namespace ZooLib
-#endif // __ZGameEngine_Tweens__
+#endif // __ZGameEngine_Tweens_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZJavaScriptCore__
-#define __ZJavaScriptCore__ 1
+#ifndef __ZJavaScriptCore_h__
+#define __ZJavaScriptCore_h__ 1
#include "zconfig.h"
#include "zoolib/ZAny.h"
@@ -289,4 +289,4 @@
} // namespace ZJavaScriptCore
} // namespace ZooLib
-#endif // __ZJavaScriptCore__
+#endif // __ZJavaScriptCore_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZCompat_npapi__
-#define __ZCompat_npapi__
+#ifndef __ZCompat_npapi_h__
+#define __ZCompat_npapi_h__
#include "zconfig.h"
#include "zoolib/ZCONFIG_SPI.h"
@@ -361,4 +361,4 @@
// =================================================================================================
-#endif // __ZCompat_npapi__
+#endif // __ZCompat_npapi_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZNetscape__
-#define __ZNetscape__ 1
+#ifndef __ZNetscape_h__
+#define __ZNetscape_h__ 1
#include "zconfig.h"
#include "zoolib/ZCONFIG_SPI.h"
@@ -115,4 +115,4 @@
} // namespace ZNetscape
} // namespace ZooLib
-#endif // __ZNetscape__
+#endif // __ZNetscape_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZNetscape_API__
-#define __ZNetscape_API__ 1
+#ifndef __ZNetscape_API_h__
+#define __ZNetscape_API_h__ 1
#include "zconfig.h"
#include "zoolib/ZCONFIG_SPI.h"
@@ -967,4 +967,4 @@
typedef ZNetscape_API_EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*);
#endif
-#endif // __ZNetscape_API__
+#endif // __ZNetscape_API_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZNetscape_Guest__
-#define __ZNetscape_Guest__ 1
+#ifndef __ZNetscape_Guest_h__
+#define __ZNetscape_Guest_h__ 1
#include "zconfig.h"
#include "zoolib/netscape/ZNetscape.h"
@@ -484,4 +484,4 @@
} // namespace ZNetscape
} // namespace ZooLib
-#endif // __ZNetscape_Guest__
+#endif // __ZNetscape_Guest_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,10 +18,10 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZNetscape_GuestEntry__
-#define __ZNetscape_GuestEntry__ 1
+#ifndef __ZNetscape_GuestEntry_h__
+#define __ZNetscape_GuestEntry_h__ 1
#include "zconfig.h"
#include "zoolib/netscape/ZNetscape.h"
-#endif // __ZNetscape_GuestEntry__
+#endif // __ZNetscape_GuestEntry_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZNetscape_GuestFactory__
-#define __ZNetscape_GuestFactory__ 1
+#ifndef __ZNetscape_GuestFactory_h__
+#define __ZNetscape_GuestFactory_h__ 1
#include "zconfig.h"
#include "zoolib/netscape/ZNetscape_Host.h" // For GuestFactory
@@ -41,4 +41,4 @@
} // namespace ZNetscape
} // namespace ZooLib
-#endif // __ZNetscape_GuestFactory__
+#endif // __ZNetscape_GuestFactory_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest_Std.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest_Std.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest_Std.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZNetscape_Guest_Std__
-#define __ZNetscape_Guest_Std__ 1
+#ifndef __ZNetscape_Guest_Std_h__
+#define __ZNetscape_Guest_Std_h__ 1
#include "zconfig.h"
#include "zoolib/netscape/ZNetscape_Guest.h"
@@ -123,4 +123,4 @@
} // namespace ZNetscape
} // namespace ZooLib
-#endif // __ZNetscape_Guest__
+#endif // __ZNetscape_Guest_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#ifndef __ZNetscape_Host__
-#define __ZNetscape_Host__ 1
+#ifndef __ZNetscape_Host_h__
+#define __ZNetscape_Host_h__ 1
#include "zconfig.h"
#include "zoolib/netscape/ZNetscape.h"
@@ -459,4 +459,4 @@
} // namespace ZNetscape
} // namespace ZooLib
-#endif // __ZNetscape_Host__
+#endif // __ZNetscape_Host_h__
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Cocoa.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Cocoa.h 2012-01-05 21:50:56 UTC (rev 2660)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Cocoa.h 2012-01-06 04:11:50 UTC (rev 2661)
@@ -18,8 +18,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------...
[truncated message content] |
|
From: <ag...@us...> - 2012-01-05 21:51:02
|
Revision: 2660
http://zoolib.svn.sourceforge.net/zoolib/?rev=2660&view=rev
Author: agreen
Date: 2012-01-05 21:50:56 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Rename XXX_Applied --> XXX_With.
Applied made some sense in the context of a tween, less so in context of a cog.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZCog.h
trunk/zoolib/source/cxx/zoolib/ZTween.h
Modified: trunk/zoolib/source/cxx/zoolib/ZCog.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCog.h 2012-01-05 21:50:14 UTC (rev 2659)
+++ trunk/zoolib/source/cxx/zoolib/ZCog.h 2012-01-05 21:50:56 UTC (rev 2660)
@@ -502,39 +502,39 @@
// =================================================================================================
#pragma mark -
-#pragma mark * sCog_Applied
+#pragma mark * sCog_With
template <class Param>
-ZCog<Param> spCogFun_Applied(const ZCog<Param>& iSelf, Param iParam,
+ZCog<Param> spCogFun_With(const ZCog<Param>& iSelf, Param iParam,
const ZCog<Param>& iCog0, const ZCog<Param>& iCog1_Init, const ZCog<Param>& iCog1);
template <class Param>
-ZCog<Param> spCog_Applied
+ZCog<Param> spCog_With
(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1_Init,
const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
{
ZAssert(iCallable0 && iCallable1_Init && iCallable1);
- static ZMACRO_auto(spCallable, sCallable(spCogFun_Applied<Param>));
+ static ZMACRO_auto(spCallable, sCallable(spCogFun_With<Param>));
return sBindR(spCallable, iCallable0, iCallable1_Init, iCallable1);
}
template <class Param>
-ZCog<Param> sCog_Applied
+ZCog<Param> sCog_With
(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
{
if (iCallable0)
{
if (iCallable1 && not sIsTerm(iCallable1))
- return spCog_Applied(iCallable0, iCallable1, iCallable1);
+ return spCog_With(iCallable0, iCallable1, iCallable1);
return iCallable0;
}
return null;
}
template <class Param>
-ZCog<Param> spCogFun_Applied(const ZCog<Param>& iSelf, Param iParam,
+ZCog<Param> spCogFun_With(const ZCog<Param>& iSelf, Param iParam,
const ZCog<Param>& iCog0, const ZCog<Param>& iCog1_Init, const ZCog<Param>& iCog1)
{
ZAssert(iCog0 && iCog1);
@@ -558,9 +558,9 @@
return lCog0;
if (sIsTerm(lCog1))
- return spCog_Applied(lCog0, iCog1_Init, iCog1_Init);
+ return spCog_With(lCog0, iCog1_Init, iCog1_Init);
- return spCog_Applied(lCog0, iCog1_Init, lCog1);
+ return spCog_With(lCog0, iCog1_Init, lCog1);
}
else if (not lCog0)
{
@@ -579,9 +579,9 @@
return lCog0;
if (sIsTerm(lCog1))
- return spCog_Applied(lCog0, iCog1_Init, iCog1_Init);
+ return spCog_With(lCog0, iCog1_Init, iCog1_Init);
- return spCog_Applied(lCog0, iCog1_Init, lCog1);
+ return spCog_With(lCog0, iCog1_Init, lCog1);
}
}
@@ -589,19 +589,19 @@
ZCog<Param> operator^
(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
- { return sCog_Applied<Param>(iCallable0, iCallable1); }
+ { return sCog_With<Param>(iCallable0, iCallable1); }
template <class Param>
ZCog<Param>& operator^=
(ZCog<Param>& ioCog0,
const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
- { return ioCog0 = sCog_Applied<Param>(ioCog0, iCallable1); }
+ { return ioCog0 = sCog_With<Param>(ioCog0, iCallable1); }
template <class Param>
-struct ZCogAccumulatorCombiner_Applied
+struct ZCogAccumulatorCombiner_With
{
void operator()(ZCog<Param>& io0, const ZCog<Param>& i1) const
- { io0 = sCog_Applied(io0, i1); }
+ { io0 = sCog_With(io0, i1); }
};
// =================================================================================================
Modified: trunk/zoolib/source/cxx/zoolib/ZTween.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZTween.h 2012-01-05 21:50:14 UTC (rev 2659)
+++ trunk/zoolib/source/cxx/zoolib/ZTween.h 2012-01-05 21:50:56 UTC (rev 2660)
@@ -325,14 +325,14 @@
// =================================================================================================
#pragma mark -
-#pragma mark * sTween_Applied
+#pragma mark * sTween_With
template <class Val0, class Val1, class Combiner = TweenCombiner<Val0,Val1> >
-class ZTween_Applied
+class ZTween_With
: public ZTween<Val0>
{
public:
- ZTween_Applied(const ZRef<ZTween<Val0> >& i0, const ZRef<ZTween<Val1> >& i1)
+ ZTween_With(const ZRef<ZTween<Val0> >& i0, const ZRef<ZTween<Val1> >& i1)
: f0(i0)
, f1(i1)
{}
@@ -358,12 +358,12 @@
};
template <class Val0, class Val1>
-ZRef<ZTween<Val0> > sTween_Applied(const ZRef<ZTween<Val0> >& i0, const ZRef<ZTween<Val1> >& i1)
+ZRef<ZTween<Val0> > sTween_With(const ZRef<ZTween<Val0> >& i0, const ZRef<ZTween<Val1> >& i1)
{
if (i0)
{
if (i1)
- return new ZTween_Applied<Val0,Val1>(i0, i1);
+ return new ZTween_With<Val0,Val1>(i0, i1);
return i0;
}
return null;
@@ -371,20 +371,20 @@
template <class Val0, class Val1>
ZRef<ZTween<Val0> > operator^(const ZRef<ZTween<Val0> >& i0, const ZRef<ZTween<Val1> >& i1)
- { return sTween_Applied(i0, i1); }
+ { return sTween_With(i0, i1); }
template <class Val0, class Val1>
ZRef<ZTween<Val0> >& operator^=(ZRef<ZTween<Val0> >& io0, const ZRef<ZTween<Val1> >& i1)
{ return io0 = io0 ^ i1; }
template <class Val_p>
-struct ZTweenAccumulatorCombiner_Applied
+struct ZTweenAccumulatorCombiner_With
{
typedef Val_p Val;
void operator()(ZRef<ZTween<Val> >& io0, const ZRef<ZTween<Val> >& i1) const
{
if (io0)
- io0 = sTween_Applied(io0, i1);
+ io0 = sTween_With(io0, i1);
else
io0 = i1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2012-01-05 21:50:20
|
Revision: 2659
http://zoolib.svn.sourceforge.net/zoolib/?rev=2659&view=rev
Author: agreen
Date: 2012-01-05 21:50:14 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Fix win version
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp 2012-01-05 21:49:41 UTC (rev 2658)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp 2012-01-05 21:50:14 UTC (rev 2659)
@@ -27,6 +27,7 @@
#include "zoolib/ZUnicode.h"
#include "zoolib/ZUtil_CF.h"
#include "zoolib/ZUtil_MacOSX.h"
+#include "zoolib/ZUtil_Win.h"
#include "zoolib/ZVal_CF.h"
#if ZCONFIG_SPI_Enabled(CoreFoundation)
@@ -70,6 +71,13 @@
P sLookup_T(HMODULE iHMODULE, const char* iName)
{ return reinterpret_cast<P>(::GetProcAddress(iHMODULE, iName)); }
+static ZQ<int> spQGetMajorVersion(const UTF16* iNativePath)
+ {
+ if (ZQ<uint64> theQ = ZUtil_Win::sQGetVersion_File(iNativePath))
+ return (*theQ) >> 48;
+ return null;
+ }
+
#endif // ZCONFIG_SPI_Enabled(Win)
// =================================================================================================
@@ -223,7 +231,12 @@
{ return fNPPluginFuncs; }
ZQ<int> GuestFactory_Win::QGetMajorVersion()
- { return spQGetMajorVersion(fHMODULE); }
+ {
+ vector<UTF16> buffer(1024);
+ if (0 <::GetModuleFileNameW(::GetModuleHandleW(nullptr), &buffer[0], buffer.size()))
+ return spQGetMajorVersion(&buffer[0]);
+ return null;
+ }
#endif // ZCONFIG_SPI_Enabled(Win)
@@ -494,15 +507,15 @@
#if ZCONFIG_SPI_Enabled(Win)
if (iEarliest || iLatest)
{
- if (ZQ<uint64,false> theQ = sQGetVersion_File(iNativePath))
+ if (ZQ<int,false> theQ = spQGetMajorVersion(ZUnicode::sAsUTF16(iNativePath).c_str()))
{ return null; }
else
{
- int theMajor = *theQ;
- if (iEarliest && *iEarliest > theMajor)
+ if (iEarliest && *iEarliest > *theQ)
{ return null; }
- else if (iLatest && *iLatest < theMajor)
+ else if (iLatest && *iLatest < *theQ)
{ return null; }
+ }
}
if (HMODULE theHMODULE = ::LoadLibraryW(ZUnicode::sAsUTF16(iNativePath).c_str()))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2012-01-05 21:49:47
|
Revision: 2658
http://zoolib.svn.sourceforge.net/zoolib/?rev=2658&view=rev
Author: agreen
Date: 2012-01-05 21:49:41 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Conform to changes elsewhere.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Util.cpp
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Util.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Util.cpp 2012-01-05 21:45:39 UTC (rev 2657)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Util.cpp 2012-01-05 21:49:41 UTC (rev 2658)
@@ -42,11 +42,14 @@
theSpec += Spec::sEnum(classApplication, Enumerated(typeOrdinal, enumTarget));
theSpec += Spec::sProperty(classProperty, keyHostVersion);
- if (const Map& versionMap = theSpec.Get().Get(keyHostVersion).GetMap())
+ if (const ZQ<Map> theQ = theSpec.QGet())
{
- sMajor = versionMap.Get(keyVersionMajor).GetInt32();
- sMinor = versionMap.Get(keyVersionMinor).GetInt32();
- sFix = versionMap.Get(keyVersionFix).GetInt32();
+ if (ZQ<Map> versionMapQ = theQ->Get(keyHostVersion).QGetMap())
+ {
+ sMajor = versionMapQ->Get(keyVersionMajor).GetInt32();
+ sMinor = versionMapQ->Get(keyVersionMinor).GetInt32();
+ sFix = versionMapQ->Get(keyVersionFix).GetInt32();
+ }
}
sFetched = true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2012-01-05 21:45:45
|
Revision: 2657
http://zoolib.svn.sourceforge.net/zoolib/?rev=2657&view=rev
Author: agreen
Date: 2012-01-05 21:45:39 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Finish sCog_Applied implementation (was just a clone of Both before).
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZCog.h
Modified: trunk/zoolib/source/cxx/zoolib/ZCog.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCog.h 2012-01-05 21:45:12 UTC (rev 2656)
+++ trunk/zoolib/source/cxx/zoolib/ZCog.h 2012-01-05 21:45:39 UTC (rev 2657)
@@ -506,16 +506,17 @@
template <class Param>
ZCog<Param> spCogFun_Applied(const ZCog<Param>& iSelf, Param iParam,
- const ZCog<Param>& iCog0, const ZCog<Param>& iCog1);
+ const ZCog<Param>& iCog0, const ZCog<Param>& iCog1_Init, const ZCog<Param>& iCog1);
template <class Param>
ZCog<Param> spCog_Applied
(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
+ const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1_Init,
const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
{
- ZAssert(iCallable0 && iCallable1);
+ ZAssert(iCallable0 && iCallable1_Init && iCallable1);
static ZMACRO_auto(spCallable, sCallable(spCogFun_Applied<Param>));
- return sBindR(spCallable, iCallable0, iCallable1);
+ return sBindR(spCallable, iCallable0, iCallable1_Init, iCallable1);
}
template <class Param>
@@ -525,8 +526,8 @@
{
if (iCallable0)
{
- if (iCallable1)
- return spCog_Applied(iCallable0, iCallable1);
+ if (iCallable1 && not sIsTerm(iCallable1))
+ return spCog_Applied(iCallable0, iCallable1, iCallable1);
return iCallable0;
}
return null;
@@ -534,29 +535,32 @@
template <class Param>
ZCog<Param> spCogFun_Applied(const ZCog<Param>& iSelf, Param iParam,
- const ZCog<Param>& iCog0, const ZCog<Param>& iCog1)
+ const ZCog<Param>& iCog0, const ZCog<Param>& iCog1_Init, const ZCog<Param>& iCog1)
{
ZAssert(iCog0 && iCog1);
+ ZAssert(not sIsTerm(iCog1));
+
ZCog<Param> lCog0 = iCog0;
ZCog<Param> lCog1 = iCog1;
if (sIsTerm(lCog0))
{
- if (not sIsTerm(lCog1) && not lCog1->Call(lCog1, iParam))
+ if (not lCog1->Call(lCog1, iParam))
return null;
return lCog0;
}
else if (sCallValidCogUnchanged(lCog0, iParam))
{
- if (sIsTerm(lCog1))
- return lCog0;
if (sCallValidCogUnchanged(lCog1, iParam))
return iSelf;
+
if (not lCog1)
return lCog0;
+
if (sIsTerm(lCog1))
- return lCog0;
- return spCog_Both(lCog0, lCog1);
+ return spCog_Applied(lCog0, iCog1_Init, iCog1_Init);
+
+ return spCog_Applied(lCog0, iCog1_Init, lCog1);
}
else if (not lCog0)
{
@@ -564,26 +568,21 @@
}
else if (sIsTerm(lCog0))
{
- if (sIsTerm(lCog1))
- return lCog1;
- if ((lCog1 = lCog1->Call(lCog1, iParam)) && sIsTerm(lCog1))
- return lCog1;
- return null;
- }
- else if (sIsTerm(lCog1))
- {
+ lCog1->Call(lCog1, iParam);
return lCog0;
}
- else if ((lCog1 = lCog1->Call(lCog1, iParam)))
+ else
{
- if (sIsTerm(lCog1))
+ lCog1 = lCog1->Call(lCog1, iParam);
+
+ if (not lCog1)
return lCog0;
- return spCog_Both(lCog0, lCog1);
+
+ if (sIsTerm(lCog1))
+ return spCog_Applied(lCog0, iCog1_Init, iCog1_Init);
+
+ return spCog_Applied(lCog0, iCog1_Init, lCog1);
}
- else
- {
- return null;
- }
}
template <class Param>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2012-01-05 21:45:18
|
Revision: 2656
http://zoolib.svn.sourceforge.net/zoolib/?rev=2656&view=rev
Author: agreen
Date: 2012-01-05 21:45:12 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Implement ZNetListener_Local_Win::GetAddress.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.h
Modified: trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.cpp 2012-01-05 21:44:42 UTC (rev 2655)
+++ trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.cpp 2012-01-05 21:45:12 UTC (rev 2656)
@@ -89,6 +89,9 @@
static string16 spAsPipeName(const string8& iName)
{ return ZUnicode::sAsUTF16("\\\\.\\pipe\\" + iName); }
+static string8 spAsName(const string16& iName)
+ { return ZUnicode::sAsUTF8(iName).substr(9); }
+
static ZRef<HANDLE> spConnect(const string& iName)
{
const string16 thePipeName = spAsPipeName(iName);
@@ -203,6 +206,9 @@
ZNetListener_Local_Win::~ZNetListener_Local_Win()
{}
+ZRef<ZNetAddress> ZNetListener_Local_Win::GetAddress()
+ { return new ZNetAddress_Local(spAsName(fPath)); }
+
ZRef<ZNetEndpoint> ZNetListener_Local_Win::Listen()
{
bool success = ::ConnectNamedPipe(fHANDLE, &fOVERLAPPED);
Modified: trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.h 2012-01-05 21:44:42 UTC (rev 2655)
+++ trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.h 2012-01-05 21:45:12 UTC (rev 2656)
@@ -84,6 +84,7 @@
virtual ~ZNetListener_Local_Win();
// From ZNetListener via ZNetListener_Local
+ virtual ZRef<ZNetAddress> GetAddress();
virtual ZRef<ZNetEndpoint> Listen();
virtual void CancelListen();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2012-01-05 21:44:48
|
Revision: 2655
http://zoolib.svn.sourceforge.net/zoolib/?rev=2655&view=rev
Author: agreen
Date: 2012-01-05 21:44:42 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Remove Get/Set/CAS API -- just use a ZCallable_Indirect anywhere runtime
switchability is needed.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZWorker.cpp
trunk/zoolib/source/cxx/zoolib/ZWorker.h
Modified: trunk/zoolib/source/cxx/zoolib/ZWorker.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZWorker.cpp 2012-01-05 21:43:49 UTC (rev 2654)
+++ trunk/zoolib/source/cxx/zoolib/ZWorker.cpp 2012-01-05 21:44:42 UTC (rev 2655)
@@ -50,7 +50,9 @@
, fCallable_Attached(iCallable_Attached)
, fCallable_Work(iCallable_Work)
, fCallable_Detached(iCallable_Detached)
- {}
+ {
+ ZAssert(fCallable_Work);
+ }
ZWorker::ZWorker
(const ZRef<Callable_Attached>& iCallable_Attached,
@@ -58,7 +60,9 @@
: fWorking(0)
, fCallable_Attached(iCallable_Attached)
, fCallable_Work(iCallable_Work)
- {}
+ {
+ ZAssert(fCallable_Work);
+ }
ZWorker::ZWorker
(const ZRef<Callable_Work>& iCallable_Work,
@@ -66,12 +70,16 @@
: fWorking(0)
, fCallable_Work(iCallable_Work)
, fCallable_Detached(iCallable_Detached)
- {}
+ {
+ ZAssert(fCallable_Work);
+ }
ZWorker::ZWorker(const ZRef<Callable_Work>& iCallable_Work)
: fWorking(0)
, fCallable_Work(iCallable_Work)
- {}
+ {
+ ZAssert(fCallable_Work);
+ }
ZWorker::ZWorker()
: fWorking(0)
@@ -83,21 +91,18 @@
for (;;)
{
+ fWorking = ZThread::sID();
+ fNextWake = kDistantFuture;
+ guard.Release();
+
ZQ<bool> result;
- if (ZRef<Callable_Work> theCallable = fCallable_Work)
- {
- fWorking = ZThread::sID();
- fNextWake = kDistantFuture;
- guard.Release();
+ try { result = fCallable_Work->QCall(this); }
+ catch (...) {}
- try { result = theCallable->QCall(this); }
- catch (...) {}
+ guard.Acquire();
+ fWorking = 0;
- guard.Acquire();
- fWorking = 0;
- }
-
if (result && result.Get())
{
if (fNextWake < kDistantFuture)
@@ -193,69 +198,6 @@
return fCaller;
}
-ZRef<ZWorker::Callable_Attached> ZWorker::Get_Callable_Attached()
- {
- ZAcqMtx acq(fMtx);
- return fCallable_Attached;
- }
-
-void ZWorker::Set_Callable_Attached(const ZRef<Callable_Attached>& iCallable)
- {
- ZAcqMtx acq(fMtx);
- fCallable_Attached = iCallable;
- }
-
-bool ZWorker::CAS_Callable_Attached(ZRef<Callable_Attached> iPrior, ZRef<Callable_Attached> iNew)
- {
- ZAcqMtx acq(fMtx);
- if (fCallable_Attached != iPrior)
- return false;
- fCallable_Attached = iNew;
- return true;
- }
-
-ZRef<ZWorker::Callable_Work> ZWorker::Get_Callable_Work()
- {
- ZAcqMtx acq(fMtx);
- return fCallable_Work;
- }
-
-void ZWorker::Set_Callable_Work(const ZRef<Callable_Work>& iCallable)
- {
- ZAcqMtx acq(fMtx);
- fCallable_Work = iCallable;
- }
-
-bool ZWorker::CAS_Callable_Work(ZRef<Callable_Work> iPrior, ZRef<Callable_Work> iNew)
- {
- ZAcqMtx acq(fMtx);
- if (fCallable_Work != iPrior)
- return false;
- fCallable_Work = iNew;
- return true;
- }
-
-ZRef<ZWorker::Callable_Detached> ZWorker::Get_Callable_Detached()
- {
- ZAcqMtx acq(fMtx);
- return fCallable_Detached;
- }
-
-void ZWorker::Set_Callable_Detached(const ZRef<Callable_Detached>& iCallable)
- {
- ZAcqMtx acq(fMtx);
- fCallable_Detached = iCallable;
- }
-
-bool ZWorker::CAS_Callable_Detached(ZRef<Callable_Detached> iPrior, ZRef<Callable_Detached> iNew)
- {
- ZAcqMtx acq(fMtx);
- if (fCallable_Detached != iPrior)
- return false;
- fCallable_Detached = iNew;
- return true;
- }
-
void ZWorker::pWakeAt(ZTime iSystemTime)
{
ZAcqMtx acq(fMtx);
Modified: trunk/zoolib/source/cxx/zoolib/ZWorker.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZWorker.h 2012-01-05 21:43:49 UTC (rev 2654)
+++ trunk/zoolib/source/cxx/zoolib/ZWorker.h 2012-01-05 21:44:42 UTC (rev 2655)
@@ -73,18 +73,6 @@
bool Attach(ZRef<ZCaller> iCaller);
bool IsAttached();
- ZRef<Callable_Attached> Get_Callable_Attached();
- void Set_Callable_Attached(const ZRef<Callable_Attached>& iCallable);
- bool CAS_Callable_Attached(ZRef<Callable_Attached> iPrior, ZRef<Callable_Attached> iNew);
-
- ZRef<Callable_Work> Get_Callable_Work();
- void Set_Callable_Work(const ZRef<Callable_Work>& iCallable);
- bool CAS_Callable_Work(ZRef<Callable_Work> iPrior, ZRef<Callable_Work> iNew);
-
- ZRef<Callable_Detached> Get_Callable_Detached();
- void Set_Callable_Detached(const ZRef<Callable_Detached>& iCallable);
- bool CAS_Callable_Detached(ZRef<Callable_Detached> iPrior, ZRef<Callable_Detached> iNew);
-
private:
void pWakeAt(ZTime iSystemTime);
@@ -93,9 +81,9 @@
ZThread::ID fWorking;
ZTime fNextWake;
- ZRef<Callable_Attached> fCallable_Attached;
- ZRef<Callable_Work> fCallable_Work;
- ZRef<Callable_Detached> fCallable_Detached;
+ const ZRef<Callable_Attached> fCallable_Attached;
+ const ZRef<Callable_Work> fCallable_Work;
+ const ZRef<Callable_Detached> fCallable_Detached;
};
} // namespace ZooLib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2012-01-05 21:43:56
|
Revision: 2654
http://zoolib.svn.sourceforge.net/zoolib/?rev=2654&view=rev
Author: agreen
Date: 2012-01-05 21:43:49 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Revive ZCommer to keep blackberry stuff compiling.
Added Paths:
-----------
trunk/zoolib/source/cxx/old/zoolib/ZCommer.cpp
trunk/zoolib/source/cxx/old/zoolib/ZCommer.h
Added: trunk/zoolib/source/cxx/old/zoolib/ZCommer.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZCommer.cpp (rev 0)
+++ trunk/zoolib/source/cxx/old/zoolib/ZCommer.cpp 2012-01-05 21:43:49 UTC (rev 2654)
@@ -0,0 +1,98 @@
+/* -------------------------------------------------------------------------------------------------
+Copyright (c) 2008 Andrew Green
+http://www.zoolib.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------------------------------- */
+
+#include "zoolib/ZCaller_Thread.h"
+#include "zoolib/ZCommer.h"
+#include "zoolib/ZGetSet.h"
+
+#include "zoolib/ZLog.h"
+
+namespace ZooLib {
+
+// =================================================================================================
+#pragma mark -
+#pragma mark * ZCommer
+
+ZCommer::ZCommer(ZRef<ZStreamerR> iStreamerR, ZRef<ZStreamerW> iStreamerW)
+: ZStreamerReader(iStreamerR),
+ ZStreamerWriter(iStreamerW),
+ fReadStarted(false),
+ fWriteStarted(false)
+ {}
+
+ZCommer::~ZCommer()
+ { ZAssert(!fReadStarted && !fWriteStarted); }
+
+void ZCommer::ReadStarted()
+ {
+ ZStreamerReader::ReadStarted();
+
+ ZGuardRMtx guard(fMtx);
+ ZAssert(!fReadStarted);
+ fReadStarted = true;
+ fCnd.Broadcast();
+ if (fReadStarted && fWriteStarted)
+ {
+ guard.Release();
+ this->Started();
+ }
+ }
+
+bool ZStreamerReader::Read(const ZStreamR& iStreamR)
+ { return false; }
+
+bool ZStreamerReader::Write(const ZStreamW& iStreamW)
+ { return false; }
+
+void ZCommer::Started()
+ {
+ ZGuardRMtx guard(fMtx);
+ if (ZRef<Callable_t> theCallable = fCallable_Started)
+ {
+ guard.Release();
+ theCallable->Call(this);
+ }
+ }
+
+void ZCommer::WaitTillFinished()
+ {
+ ZAcqMtx locker(fMtx);
+ while (fReadStarted || fWriteStarted)
+ fCnd.Wait(fMtx);
+ }
+
+void ZCommer::SetCallable_Finished(ZRef<Callable_t> iCallable)
+ {
+ ZAcqMtx locker(fMtx);
+ return sGetSet(fCallable_Finished, iCallable);
+ }
+
+// =================================================================================================
+#pragma mark -
+#pragma mark * ZCommer utility methods
+
+void sStartCommerRunners(ZRef<ZCommer> iCommer)
+ {
+ ZRef<ZCaller> theCaller = new ZCaller_Thread;
+ iCommer.StaticCast<ZStreamerReader>()->Attach(theCaller);
+ iCommer.StaticCast<ZStreamerWriter>()->Attach(theCaller);
+ }
+
+} // namespace ZooLib
Added: trunk/zoolib/source/cxx/old/zoolib/ZCommer.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZCommer.h (rev 0)
+++ trunk/zoolib/source/cxx/old/zoolib/ZCommer.h 2012-01-05 21:43:49 UTC (rev 2654)
@@ -0,0 +1,72 @@
+/* -------------------------------------------------------------------------------------------------
+Copyright (c) 2008 Andrew Green
+http://www.zoolib.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------------------------------- */
+
+#ifndef __ZCommer__
+#define __ZCommer__ 1
+#include "zconfig.h"
+
+#include "zoolib/ZCallable.h"
+#include "zoolib/ZStreamer.h"
+#include "zoolib/ZThread.h"
+
+namespace ZooLib {
+
+// =================================================================================================
+#pragma mark -
+#pragma mark * ZCommer
+
+class ZCommer
+: public ZCounted
+ {
+public:
+ ZCommer(ZRef<ZStreamerR> iStreamerR, ZRef<ZStreamerW> iStreamerW);
+ virtual ~ZCommer();
+
+// Our protocol
+ virtual bool Read(const ZStreamR& iStreamR);
+ virtual bool Write(const ZStreamW& iStreamW);
+
+ void WaitTillFinished();
+
+ void WakeWrite();
+
+ typedef ZRef<ZCommer> ZRef_ZCommer;
+ typedef ZCallable<void(ZRef_ZCommer)> Callable_t;
+ void SetCallable_Finished(ZRef<Callable_t> iCallable);
+
+private:
+ ZMtx fMtx;
+ ZCnd fCnd;
+ bool fReadStarted;
+ bool fWriteStarted;
+ ZRef<Callable_t> fCallable_Finished;
+ ZRef<ZStreamerR> fStreamerR;
+ ZRef<ZStreamerW> fStreamerW;
+ };
+
+// =================================================================================================
+#pragma mark -
+#pragma mark * ZCommer utility methods
+
+void sStartCommerRunners(ZRef<ZCommer> iCommer);
+
+} // namespace ZooLib
+
+#endif // __ZCommer__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-27 06:26:06
|
Revision: 2653
http://zoolib.svn.sourceforge.net/zoolib/?rev=2653&view=rev
Author: agreen
Date: 2011-12-27 06:26:00 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
RootAugment gives us something akin to parameterization.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZYadTree.cpp
trunk/zoolib/source/cxx/zoolib/ZYadTree.h
Modified: trunk/zoolib/source/cxx/zoolib/ZYadTree.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYadTree.cpp 2011-12-27 03:26:23 UTC (rev 2652)
+++ trunk/zoolib/source/cxx/zoolib/ZYadTree.cpp 2011-12-27 06:26:00 UTC (rev 2653)
@@ -24,6 +24,8 @@
#include "zoolib/ZUtil_STL_map.h"
#include "zoolib/ZYadTree.h"
+#include "zoolib/ZLog.h"
+
using std::string;
namespace ZooLib {
@@ -43,12 +45,17 @@
public:
Chain(const ZRef<Chain>& iParent, const ZRef<ZYadMapRPos>& iYadMapRPos);
+ Chain(const std::string& iRootAugmentName, const ZRef<Chain>& iRootAugment,
+ const ZRef<ZYadMapRPos>& iYadMapRPos);
ZRef<Chain> Clone();
ZRef<ZYadR> ReadInc(string& oName);
ZRef<ZYadR> ReadAt(const ZRef<CountedString>& iProtoName, const string& iName);
+ ZRef<Chain> WithRootAugment
+ (const std::string& iRootAugmentName, const ZRef<Chain>& iRootAugment);
+
private:
ZRef<ZYadR> pReadAt(const string& iName);
@@ -112,6 +119,11 @@
virtual void SetPosition(const string& iName);
virtual ZRef<ZYadR> ReadAt(const string& iName);
+// Our protocol
+ ZRef<Chain> GetChain();
+ ZRef<YadMapRPos> WithRootAugment
+ (const std::string& iRootAugmentName, const ZRef<Chain>& iRootAugment);
+
private:
const ZRef<CountedString> fProtoName;
ZRef<Chain> fChain;
@@ -153,6 +165,13 @@
ZAssert(not iYadMapRPos.DynamicCast<YadMapRPos>());
}
+Chain::Chain(const std::string& iRootAugmentName, const ZRef<Chain>& iRootAugment,
+ const ZRef<ZYadMapRPos>& iYadMapRPos)
+: fYadMapRPos(iYadMapRPos->Clone().DynamicCast<ZYadMapRPos>())
+ {
+ ZUtil_STL::sInsertMustNotContain(fCacheByName, iRootAugmentName, iRootAugment);
+ }
+
ZRef<Chain> Chain::Clone()
{ return new Chain(*this); }
@@ -205,15 +224,25 @@
}
// Walk down the remainder of the trail
- ZRef<Chain> result;
- while (index < theTrail.Count())
+
+ if (index < theTrail.Count())
{
- if (ZRef<ZYadMapRPos,0> theYadMapRPos =
- cur->pReadAt(theTrail.At(index)).DynamicCast<ZYadMapRPos>())
- { break; }
- else
+ for (;;)
{
- cur = new Chain(cur, theYadMapRPos);
+ const string theComp = theTrail.At(index);
+ if (ZQ<ZRef<Chain> > aChain = sQGet(cur->fCacheByName, theComp))
+ {
+ cur = *aChain;
+ }
+ else if (ZRef<ZYadMapRPos,0> theYadMapRPos =
+ cur->pReadAt(theComp).DynamicCast<ZYadMapRPos>())
+ {
+ break;
+ }
+ else
+ {
+ cur = new Chain(cur, theYadMapRPos);
+ }
if (++index == theTrail.Count())
{
theChain = cur;
@@ -237,6 +266,15 @@
return null;
}
+ZRef<Chain> Chain::WithRootAugment
+ (const std::string& iRootAugmentName, const ZRef<Chain>& iRootAugment)
+ {
+ ZRef<ZYadMapRPos> newYad = fYadMapRPos->Clone().DynamicCast<ZYadMapRPos>();
+ if (fParent)
+ return new Chain(fParent->WithRootAugment(iRootAugmentName, iRootAugment), newYad);
+ return new Chain(iRootAugmentName, iRootAugment, newYad);
+ }
+
// =================================================================================================
#pragma mark -
#pragma mark * YadSeqRPos definition
@@ -308,16 +346,38 @@
void YadMapRPos::SetPosition(const string& iName)
{ fPosition = iName; }
+ZRef<Chain> YadMapRPos::GetChain()
+ { return fChain; }
+
+ZRef<YadMapRPos> YadMapRPos::WithRootAugment
+ (const std::string& iRootAugmentName, const ZRef<Chain>& iRootAugment)
+ {
+ ZRef<Chain> newChain = fChain->WithRootAugment(iRootAugmentName, iRootAugment);
+ return new YadMapRPos(fProtoName, newChain, string()); }
+
} // namespace YadTree
// =================================================================================================
#pragma mark -
#pragma mark * YadMapRPos definition
+using namespace YadTree;
+
ZRef<ZYadMapRPos> sYadTree(const ZRef<ZYadMapRPos>& iYadMapRPos, const string& iProtoName)
- { return new YadTree::YadMapRPos(new YadTree::CountedString(iProtoName), iYadMapRPos); }
+ { return new YadMapRPos(new CountedString(iProtoName), iYadMapRPos); }
ZRef<ZYadMapRPos> sYadTree(const ZRef<ZYadMapRPos>& iYadMapRPos)
{ return sYadTree(iYadMapRPos, "_"); }
+ZRef<ZYadMapRPos> sParameterizedYadTree(const ZRef<ZYadMapRPos>& iBase,
+ const std::string& iRootAugmentName, const ZRef<ZYadMapRPos>& iRootAugment)
+ {
+ if (ZRef<YadMapRPos> theBase = iBase.DynamicCast<YadMapRPos>())
+ {
+ if (ZRef<YadMapRPos> theRootAugment = iRootAugment.DynamicCast<YadMapRPos>())
+ return theBase->WithRootAugment(iRootAugmentName, theRootAugment->GetChain());
+ }
+ return iBase;
+ }
+
} // namespace ZooLib
Modified: trunk/zoolib/source/cxx/zoolib/ZYadTree.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYadTree.h 2011-12-27 03:26:23 UTC (rev 2652)
+++ trunk/zoolib/source/cxx/zoolib/ZYadTree.h 2011-12-27 06:26:00 UTC (rev 2653)
@@ -30,6 +30,9 @@
ZRef<ZYadMapRPos> sYadTree(const ZRef<ZYadMapRPos>& iYadMapRPos);
+ZRef<ZYadMapRPos> sParameterizedYadTree(const ZRef<ZYadMapRPos>& iBase,
+ const std::string& iRootAugmentName, const ZRef<ZYadMapRPos>& iRootAugment);
+
} // namespace ZooLib
#endif // __ZYadTree__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-27 03:26:30
|
Revision: 2652
http://zoolib.svn.sourceforge.net/zoolib/?rev=2652&view=rev
Author: agreen
Date: 2011-12-27 03:26:23 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Make field and param names more distinct.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZYadTree.cpp
Modified: trunk/zoolib/source/cxx/zoolib/ZYadTree.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYadTree.cpp 2011-12-22 00:59:28 UTC (rev 2651)
+++ trunk/zoolib/source/cxx/zoolib/ZYadTree.cpp 2011-12-27 03:26:23 UTC (rev 2652)
@@ -42,13 +42,12 @@
Chain(const Chain& iOther);
public:
- Chain
- (const ZRef<Chain>& iParent, const ZRef<ZYadMapRPos>& iYadMapRPos);
+ Chain(const ZRef<Chain>& iParent, const ZRef<ZYadMapRPos>& iYadMapRPos);
ZRef<Chain> Clone();
ZRef<ZYadR> ReadInc(string& oName);
- ZRef<ZYadR> ReadAt(const ZRef<CountedString>& iProto, const string& iName);
+ ZRef<ZYadR> ReadAt(const ZRef<CountedString>& iProtoName, const string& iName);
private:
ZRef<ZYadR> pReadAt(const string& iName);
@@ -68,7 +67,7 @@
: public ZYadSeqRPos
{
public:
- YadSeqRPos(const ZRef<CountedString>& iProto,
+ YadSeqRPos(const ZRef<CountedString>& iProtoName,
const ZRef<Chain>& iChain, const ZRef<ZYadSeqRPos>& iYadSeqRPos);
// From ZYadSeqR via ZYadSeqRPos
@@ -85,7 +84,7 @@
virtual ZRef<ZYadR> ReadAt(uint64 iPosition);
private:
- const ZRef<CountedString> fProto;
+ const ZRef<CountedString> fProtoName;
const ZRef<Chain> fChain;
const ZRef<ZYadSeqRPos> fYadSeqRPos;
};
@@ -98,10 +97,10 @@
: public ZYadMapRPos
{
public:
- YadMapRPos(const ZRef<CountedString>& iProto,
+ YadMapRPos(const ZRef<CountedString>& iProtoName,
const ZRef<Chain>& iChain, const string& iPosition);
- YadMapRPos(const ZRef<CountedString>& iProto, const ZRef<ZYadMapRPos>& iYad);
+ YadMapRPos(const ZRef<CountedString>& iProtoName, const ZRef<ZYadMapRPos>& iYad);
// From ZYadMapR via ZYadMapRPos
ZRef<ZYadR> ReadInc(string& oName);
@@ -114,7 +113,7 @@
virtual ZRef<ZYadR> ReadAt(const string& iName);
private:
- const ZRef<CountedString> fProto;
+ const ZRef<CountedString> fProtoName;
ZRef<Chain> fChain;
string fPosition;
};
@@ -123,14 +122,14 @@
#pragma mark -
#pragma mark * Helpers
-static ZRef<ZYadR> spWrap(const ZRef<CountedString>& iProto,
+static ZRef<ZYadR> spWrap(const ZRef<CountedString>& iProtoName,
const ZRef<Chain>& iChain, const ZRef<ZYadR>& iYad)
{
if (ZRef<ZYadSeqRPos> theYadSeqRPos = iYad.DynamicCast<ZYadSeqRPos>())
- return new YadSeqRPos(iProto, iChain, theYadSeqRPos);
+ return new YadSeqRPos(iProtoName, iChain, theYadSeqRPos);
if (ZRef<ZYadMapRPos> theYadMapRPos = iYad.DynamicCast<ZYadMapRPos>())
- return new YadMapRPos(iProto, new Chain(iChain, theYadMapRPos), string());
+ return new YadMapRPos(iProtoName, new Chain(iChain, theYadMapRPos), string());
return iYad;
}
@@ -150,6 +149,7 @@
: fParent(iParent)
, fYadMapRPos(iYadMapRPos)
{
+ // It's an error and a problem if iYadMapRPos is a YadTree::YadMapRPos.
ZAssert(not iYadMapRPos.DynamicCast<YadMapRPos>());
}
@@ -162,20 +162,22 @@
ZRef<ZYadR> Chain::pReadAt(const string& iName)
{ return fYadMapRPos->ReadAt(iName); }
-ZRef<ZYadR> Chain::ReadAt(const ZRef<CountedString>& iProto, const string& iName)
+ZRef<ZYadR> Chain::ReadAt(const ZRef<CountedString>& iProtoName, const string& iName)
{
+ using namespace ZUtil_STL;
+
if (ZRef<ZYadR> theYad = this->pReadAt(iName))
- return spWrap(iProto, this, theYad);
+ return spWrap(iProtoName, this, theYad);
ZRef<Chain> theChain;
- if (ZQ<ZRef<Chain> > theByNameQ = ZUtil_STL::sQGet(fCacheByName, iName))
+ if (ZQ<ZRef<Chain> > theByNameQ = sQGet(fCacheByName, iName))
{
theChain = *theByNameQ;
}
- else if (ZRef<ZYadStrimR> theProtoYad = this->pReadAt(iProto->Get()).DynamicCast<ZYadStrimR>())
+ else if (ZRef<ZYadStrimR> theProtoYad = this->pReadAt(iProtoName->Get()).DynamicCast<ZYadStrimR>())
{
const string theTrailString = theProtoYad->GetStrimR().ReadAll8();
- if (ZQ<ZRef<Chain> > theByTrailQ = ZUtil_STL::sQGet(fCacheByTrail, theTrailString))
+ if (ZQ<ZRef<Chain> > theByTrailQ = sQGet(fCacheByTrail, theTrailString))
{
theChain = *theByTrailQ;
}
@@ -220,17 +222,17 @@
}
}
}
- ZUtil_STL::sInsertMustNotContain(fCacheByTrail, theTrailString, theChain);
+ sInsertMustNotContain(fCacheByTrail, theTrailString, theChain);
}
- ZUtil_STL::sInsertMustNotContain(fCacheByName, iName, theChain);
+ sInsertMustNotContain(fCacheByName, iName, theChain);
}
if (theChain)
- return theChain->ReadAt(iProto, iName);
+ return theChain->ReadAt(iProtoName, iName);
// Yay, lexical scoping, disabled for now.
if (false && fParent)
- return spWrap(iProto, fParent, fParent->pReadAt(iName));
+ return spWrap(iProtoName, fParent, fParent->pReadAt(iName));
return null;
}
@@ -239,18 +241,18 @@
#pragma mark -
#pragma mark * YadSeqRPos definition
-YadSeqRPos::YadSeqRPos(const ZRef<CountedString>& iProto,
+YadSeqRPos::YadSeqRPos(const ZRef<CountedString>& iProtoName,
const ZRef<Chain>& iChain, const ZRef<ZYadSeqRPos>& iYadSeqRPos)
-: fProto(iProto)
+: fProtoName(iProtoName)
, fChain(iChain)
, fYadSeqRPos(iYadSeqRPos)
{}
ZRef<ZYadR> YadSeqRPos::ReadInc()
- { return spWrap(fProto, fChain, fYadSeqRPos->ReadInc()); }
+ { return spWrap(fProtoName, fChain, fYadSeqRPos->ReadInc()); }
ZRef<ZYadSeqRClone> YadSeqRPos::Clone()
- { return new YadSeqRPos(fProto, fChain, fYadSeqRPos->Clone().DynamicCast<ZYadSeqRPos>()); }
+ { return new YadSeqRPos(fProtoName, fChain, fYadSeqRPos->Clone().DynamicCast<ZYadSeqRPos>()); }
uint64 YadSeqRPos::GetPosition()
{ return fYadSeqRPos->GetPosition(); }
@@ -262,21 +264,21 @@
{ return fYadSeqRPos->GetSize(); }
ZRef<ZYadR> YadSeqRPos::ReadAt(uint64 iPosition)
- { return spWrap(fProto, fChain, fYadSeqRPos->ReadAt(iPosition)); }
+ { return spWrap(fProtoName, fChain, fYadSeqRPos->ReadAt(iPosition)); }
// =================================================================================================
#pragma mark -
#pragma mark * YadMapRPos definition
-YadMapRPos::YadMapRPos(const ZRef<CountedString>& iProto,
+YadMapRPos::YadMapRPos(const ZRef<CountedString>& iProtoName,
const ZRef<Chain>& iChain, const string& iPosition)
-: fProto(iProto)
+: fProtoName(iProtoName)
, fChain(iChain)
, fPosition(iPosition)
{}
-YadMapRPos::YadMapRPos(const ZRef<CountedString>& iProto, const ZRef<ZYadMapRPos>& iYad)
-: fProto(iProto)
+YadMapRPos::YadMapRPos(const ZRef<CountedString>& iProtoName, const ZRef<ZYadMapRPos>& iYad)
+: fProtoName(iProtoName)
, fChain(new Chain(null, iYad))
{}
@@ -289,7 +291,7 @@
return fChain->ReadInc(oName);
oName = fPosition;
- return fChain->ReadAt(fProto, sGetSet(fPosition, string()));
+ return fChain->ReadAt(fProtoName, sGetSet(fPosition, string()));
}
ZRef<ZYadR> YadMapRPos::ReadAt(const string& iName)
@@ -297,11 +299,11 @@
if (fChain->IsShared())
fChain = fChain->Clone();
fPosition.clear();
- return fChain->ReadAt(fProto, iName);
+ return fChain->ReadAt(fProtoName, iName);
}
ZRef<ZYadMapRClone> YadMapRPos::Clone()
- { return new YadMapRPos(fProto, fChain->Clone(), fPosition); }
+ { return new YadMapRPos(fProtoName, fChain->Clone(), fPosition); }
void YadMapRPos::SetPosition(const string& iName)
{ fPosition = iName; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-22 00:59:34
|
Revision: 2651
http://zoolib.svn.sourceforge.net/zoolib/?rev=2651&view=rev
Author: agreen
Date: 2011-12-22 00:59:28 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
Support reading binary values.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_JSON.h
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp 2011-12-18 04:28:30 UTC (rev 2650)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp 2011-12-22 00:59:28 UTC (rev 2651)
@@ -255,6 +255,10 @@
{
return new YadStrimR(iStrimmerU);
}
+ else if (iReadOptions.fAllowBinary.DGet(false) && sTryRead_CP(theStrimU, '('))
+ {
+ return new YadStreamR(iStrimmerU);
+ }
else
{
ZAny theVal;
@@ -315,6 +319,26 @@
// =================================================================================================
#pragma mark -
+#pragma mark * YadStreamR
+
+YadStreamR::YadStreamR(ZRef<ZStrimmerU> iStrimmerU)
+: fStrimmerU(iStrimmerU)
+, fStreamR(iStrimmerU->GetStrimU())
+ {}
+
+void YadStreamR::Finish()
+ {
+ using namespace ZUtil_Strim;
+ fStreamR.SkipAll();
+ if (not sTryRead_CP(fStrimmerU->GetStrimU(), ')'))
+ spThrowParseException("Expected ')' to close a binary data");
+ }
+
+const ZStreamR& YadStreamR::GetStreamR()
+ { return fStreamR; }
+
+// =================================================================================================
+#pragma mark -
#pragma mark * YadStrimR
YadStrimR::YadStrimR(ZRef<ZStrimmerU> iStrimmerU)
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_JSON.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_JSON.h 2011-12-18 04:28:30 UTC (rev 2650)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_JSON.h 2011-12-22 00:59:28 UTC (rev 2651)
@@ -22,6 +22,7 @@
#define __ZYad_JSON__ 1
#include "zconfig.h"
+#include "zoolib/ZStreamR_HexStrim.h"
#include "zoolib/ZStrim.h"
#include "zoolib/ZStrim_Escaped.h"
#include "zoolib/ZYad_Std.h"
@@ -71,6 +72,27 @@
// =================================================================================================
#pragma mark -
+#pragma mark * YadStreamR
+
+class YadStreamR
+: public ZYadStreamR
+ {
+public:
+ YadStreamR(ZRef<ZStrimmerU> iStrimmerU);
+
+// From ZYadR
+ virtual void Finish();
+
+// From ZStreamerR via ZYadStreamR
+ const ZStreamR& GetStreamR();
+
+private:
+ ZRef<ZStrimmerU> fStrimmerU;
+ ZStreamR_HexStrim fStreamR;
+ };
+
+// =================================================================================================
+#pragma mark -
#pragma mark * YadStrimR
class YadStrimR
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-18 04:28:36
|
Revision: 2650
http://zoolib.svn.sourceforge.net/zoolib/?rev=2650&view=rev
Author: agreen
Date: 2011-12-18 04:28:30 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Add ZUtil_Win::sQGetVersion_File.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZUtil_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Win.h
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_Win.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Win.cpp 2011-12-18 04:27:29 UTC (rev 2649)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Win.cpp 2011-12-18 04:28:30 UTC (rev 2650)
@@ -24,6 +24,8 @@
#include "zoolib/ZCompat_Win.h"
+#include <vector>
+
namespace ZooLib {
// From Whisper 1.3
@@ -99,6 +101,24 @@
#endif
}
+ZQ<uint64> ZUtil_Win::sQGetVersion_File(const WCHAR* iPath)
+ {
+ DWORD dummy;
+ if (DWORD theSize = ::GetFileVersionInfoSizeW(iPath, &dummy))
+ {
+ std::vector<char> buffer(theSize);
+ if (::GetFileVersionInfoW(iPath, 0, theSize, &buffer[0]))
+ {
+ VS_FIXEDFILEINFO* info;
+ UINT infoSize;
+ if (::VerQueryValueW(&buffer[0], const_cast<WCHAR*>(L"\\"), (void**)&info, &infoSize)
+ && infoSize >= sizeof(VS_FIXEDFILEINFO))
+ { return (uint64(info->dwFileVersionMS) << 32) | info->dwFileVersionLS; }
+ }
+ }
+ return null;
+ }
+
} // namespace ZooLib
#endif // ZCONFIG_SPI_Enabled(Win)
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_Win.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Win.h 2011-12-18 04:27:29 UTC (rev 2649)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Win.h 2011-12-18 04:28:30 UTC (rev 2650)
@@ -23,11 +23,12 @@
#include "zconfig.h"
#include "zoolib/ZCONFIG_SPI.h"
#include "zoolib/ZCompat_Win.h"
+#include "zoolib/ZQ.h"
+#include "zoolib/ZStdInt.h" // For uint64
-namespace ZooLib {
-
#if ZCONFIG_SPI_Enabled(Win)
+namespace ZooLib {
namespace ZUtil_Win {
bool sIsWinNT();
@@ -38,10 +39,10 @@
HINSTANCE sGetModuleHandle();
+ZQ<uint64> sQGetVersion_File(const WCHAR* iPath);
+
} // namespace ZUtil_Win
+} // namespace ZooLib
#endif // ZCONFIG_SPI_Enabled(Win)
-
-} // namespace ZooLib
-
#endif // __ZUtil_Win__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-18 04:27:35
|
Revision: 2649
http://zoolib.svn.sourceforge.net/zoolib/?rev=2649&view=rev
Author: agreen
Date: 2011-12-18 04:27:29 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Some changes to allow version-dependent loading of stuff.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp 2011-12-14 20:56:42 UTC (rev 2648)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp 2011-12-18 04:27:29 UTC (rev 2649)
@@ -27,6 +27,7 @@
#include "zoolib/ZUnicode.h"
#include "zoolib/ZUtil_CF.h"
#include "zoolib/ZUtil_MacOSX.h"
+#include "zoolib/ZVal_CF.h"
#if ZCONFIG_SPI_Enabled(CoreFoundation)
#include ZMACINCLUDE2(CoreFoundation,CFBundle.h)
@@ -126,6 +127,30 @@
P sLookup_T(CFBundleRef iBundleRef, CFStringRef iName)
{ return reinterpret_cast<P>(::CFBundleGetFunctionPointerForName(iBundleRef, iName)); }
+ZQ<int> spQGetMajorVersion(const ZRef<CFStringRef>& iStringRef)
+ {
+ if (iStringRef)
+ {
+ if (SInt32 theVal = ::CFStringGetIntValue(iStringRef))
+ return theVal;
+ }
+ return null;
+ }
+
+ZQ<int> spQGetMajorVersion(const ZMap_CF& iMap)
+ { return spQGetMajorVersion(iMap.Get(kCFBundleVersionKey).GetCFString()); }
+
+ZQ<int> spQGetMajorVersion(const ZRef<CFBundleRef>& iBundleRef)
+ {
+ if (iBundleRef)
+ {
+ if (ZRef<CFStringRef> theStringRef =
+ (CFStringRef)::CFBundleGetValueForInfoDictionaryKey(iBundleRef, kCFBundleVersionKey))
+ { return spQGetMajorVersion(theStringRef); }
+ }
+ return null;
+ }
+
#endif // ZCONFIG_SPI_Enabled(CoreFoundation)
// =================================================================================================
@@ -142,6 +167,8 @@
virtual const NPPluginFuncs& GetEntryPoints();
+ virtual ZQ<int> QGetMajorVersion();
+
private:
HMODULE fHMODULE;
NPNetscapeFuncs_Z fNPNF;
@@ -195,6 +222,9 @@
const NPPluginFuncs& GuestFactory_Win::GetEntryPoints()
{ return fNPPluginFuncs; }
+ZQ<int> GuestFactory_Win::QGetMajorVersion()
+ { return spQGetMajorVersion(fHMODULE); }
+
#endif // ZCONFIG_SPI_Enabled(Win)
// =================================================================================================
@@ -216,6 +246,8 @@
virtual const NPPluginFuncs& GetEntryPoints();
+ virtual ZQ<int> QGetMajorVersion();
+
private:
ZRef<CFPlugInRef> fPlugInRef;
NSModule fNSModule;
@@ -240,7 +272,7 @@
// If the plugin contains ObjC code then unloading it will kill the
// host application. So (for now at least) we do an extra retain, leaving
// the rest of the plugin management as it should be.
- ::CFRetain(fPlugInRef);
+ //##::CFRetain(fPlugInRef);
// Get our own copies of our host's function pointers
GuestFactory::GetNPNF(fNPNF);
@@ -343,6 +375,9 @@
const NPPluginFuncs& GuestFactory_HostMachO::GetEntryPoints()
{ return fNPPluginFuncs; }
+ZQ<int> GuestFactory_HostMachO::QGetMajorVersion()
+ { return spQGetMajorVersion(fPlugInRef); }
+
#endif // ZCONFIG_SPI_Enabled(CoreFoundation) && __MACH__
// =================================================================================================
@@ -386,7 +421,7 @@
// If the plugin contains ObjC code then unloading it will kill the
// host application. So (for now at least) we do an extra retain, leaving
// the rest of the plugin management as it should be.
- ::CFRetain(fPlugInRef);
+ //##::CFRetain(fPlugInRef);
// Get local copies of our host's function pointers
GuestFactory::GetNPNF(fNPNF);
@@ -451,35 +486,52 @@
#pragma mark -
#pragma mark * ZNetscape
-ZRef<ZNetscape::GuestFactory> ZNetscape::sMakeGuestFactory(const std::string& iNativePath)
+ZRef<ZNetscape::GuestFactory> ZNetscape::sMakeGuestFactory
+ (ZQ<int> iEarliest, ZQ<int> iLatest, const std::string& iNativePath)
{
try
{
#if ZCONFIG_SPI_Enabled(Win)
- if (HMODULE theHMODULE = ::LoadLibraryW
- (ZUnicode::sAsUTF16(iNativePath).c_str()))
+ if (iEarliest || iLatest)
{
- try
+ if (ZQ<uint64,false> theQ = sQGetVersion_File(iNativePath))
+ { return null; }
+ else
{
- return new GuestFactory_Win(theHMODULE);
- }
- catch (...)
- {
- ::FreeLibrary(theHMODULE);
- }
+ int theMajor = *theQ;
+ if (iEarliest && *iEarliest > theMajor)
+ { return null; }
+ else if (iLatest && *iLatest < theMajor)
+ { return null; }
}
+
+ if (HMODULE theHMODULE = ::LoadLibraryW(ZUnicode::sAsUTF16(iNativePath).c_str()))
+ {
+ try { return new GuestFactory_Win(theHMODULE); }
+ catch (...) { ::FreeLibrary(theHMODULE); }
+ }
#endif
#if ZCONFIG_SPI_Enabled(CoreFoundation)
if (ZRef<CFURLRef> theURL = sAdopt& ::CFURLCreateWithFileSystemPath
(nullptr, ZUtil_CF::sString(iNativePath), kCFURLPOSIXPathStyle, true))
{
- if (ZRef<CFPlugInRef> thePlugInRef = sAdopt& ::CFPlugInCreate(nullptr, theURL))
+ if (ZMap_CF theMap = sAdopt& ::CFBundleCopyInfoDictionaryInDirectory(theURL))
{
+ if (ZQ<int,false> theQ = spQGetMajorVersion(theMap))
+ { return null; }
+ else if (iEarliest && *iEarliest > *theQ)
+ { return null; }
+ else if (iLatest && *iLatest < *theQ)
+ { return null; }
+ }
+
+ if (ZRef<CFBundleRef> theBundleRef = sAdopt& ::CFBundleCreate(nullptr, theURL))
+ {
#if __MACH__
- return new GuestFactory_HostMachO(thePlugInRef);
+ return new GuestFactory_HostMachO(theBundleRef);
#elif ZCONFIG(Processor,PPC)
- return new GuestFactory_HostCFM(thePlugInRef);
+ return new GuestFactory_HostCFM(theBundleRef);
#endif
}
}
@@ -491,4 +543,7 @@
return null;
}
+ZRef<ZNetscape::GuestFactory> ZNetscape::sMakeGuestFactory(const std::string& iNativePath)
+ { return sMakeGuestFactory(null, null, iNativePath); }
+
} // namespace ZooLib
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.h 2011-12-14 20:56:42 UTC (rev 2648)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.h 2011-12-18 04:27:29 UTC (rev 2649)
@@ -33,6 +33,9 @@
#pragma mark -
#pragma mark * ZNetscape
+ZRef<GuestFactory> sMakeGuestFactory
+ (ZQ<int> iEarliest, ZQ<int> iLatest, const std::string& iNativePath);
+
ZRef<GuestFactory> sMakeGuestFactory(const std::string& iNativePath);
} // namespace ZNetscape
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h 2011-12-14 20:56:42 UTC (rev 2648)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h 2011-12-18 04:27:29 UTC (rev 2649)
@@ -402,6 +402,8 @@
void GetNPNF(NPNetscapeFuncs_Z& oNPNF);
virtual const NPPluginFuncs& GetEntryPoints() = 0;
+
+ virtual ZQ<int> QGetMajorVersion() = 0;
};
// =================================================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-14 20:56:48
|
Revision: 2648
http://zoolib.svn.sourceforge.net/zoolib/?rev=2648&view=rev
Author: agreen
Date: 2011-12-14 20:56:42 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Make concurrent use with git a bit easier.
Added Paths:
-----------
trunk/zoolib/source/cxx/.gitignore
Added: trunk/zoolib/source/cxx/.gitignore
===================================================================
--- trunk/zoolib/source/cxx/.gitignore (rev 0)
+++ trunk/zoolib/source/cxx/.gitignore 2011-12-14 20:56:42 UTC (rev 2648)
@@ -0,0 +1,2 @@
+.DS_Store
+.svn
Property changes on: trunk/zoolib/source/cxx/.gitignore
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-14 20:55:38
|
Revision: 2647
http://zoolib.svn.sourceforge.net/zoolib/?rev=2647&view=rev
Author: agreen
Date: 2011-12-14 20:55:32 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Use ZLOGPF.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Win.cpp
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Win.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Win.cpp 2011-12-14 20:52:46 UTC (rev 2646)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Win.cpp 2011-12-14 20:55:32 UTC (rev 2647)
@@ -77,15 +77,15 @@
{
case NPPVpluginWindowBool:
{
- if (ZLOG(s, eDebug - 1, "Host_Win"))
- s << "Host_SetValue, NPPVpluginWindowBool: " << (value ? "true" : "false");
+ if (ZLOGPF(s, eDebug - 1))
+ s << "NPPVpluginWindowBool: " << (value ? "true" : "false");
fIsWindowed = value;
return NPERR_NO_ERROR;
}
case NPPVpluginTransparentBool:
{
- if (ZLOG(s, eDebug - 1, "Host_Win"))
- s << "Host_SetValue, NPPVpluginTransparentBool: " << (value ? "true" : "false");
+ if (ZLOGPF(s, eDebug - 1))
+ s << "NPPVpluginTransparentBool: " << (value ? "true" : "false");
fIsTransparent = value;
return NPERR_NO_ERROR;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-14 20:52:52
|
Revision: 2646
http://zoolib.svn.sourceforge.net/zoolib/?rev=2646&view=rev
Author: agreen
Date: 2011-12-14 20:52:46 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Use ZLOGPF.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Mac.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Mac.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Mac.cpp 2011-12-14 20:49:18 UTC (rev 2645)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Mac.cpp 2011-12-14 20:52:46 UTC (rev 2646)
@@ -60,7 +60,7 @@
s << "what: " << ZUtil_CarbonEvents::sEventTypeAsString(iER.what)
<< ", message: " << iER.message
<< ", when: " << iER.when
- << ", where: (" << iER.where.h << ", " << iER.where.v
+ << ", where: (" << iER.where.h << ", " << iER.where.v << ")"
<< ", modifiers: " << iER.modifiers;
}
@@ -143,7 +143,7 @@
#if defined(XP_MACOSX)
case NPPVpluginDrawingModel:
{
- if (ZLOG(s, eDebug, "Host_Mac"))
+ if (ZLOGPF(s, eDebug))
s << "Host_SetValue, NPPVpluginDrawingModel";
if (reinterpret_cast<intptr_t>(value) == NPDrawingModelCoreGraphics)
fUseCoreGraphics = true;
@@ -214,7 +214,7 @@
EventRecord theER = iEvent;
if (theER.what != nullEvent)
{
- if (ZLOG(s, eDebug + 1, "Host_Mac"))
+ if (ZLOGPF(s, eDebug+1))
{
s << "DoEvent, ";
spWriteEvent(s, theER);
@@ -231,7 +231,7 @@
void Host_Mac::DoSetWindow(int iX, int iY, int iWidth, int iHeight)
{
- if (ZLOG(s, eDebug + 1, "Host_Mac"))
+ if (ZLOGPF(s, eDebug + 1))
s.Writef("DoSetWindow, (%d, %d, %d, %d)", iX, iY, iX + iWidth, iY + iHeight);
#if !defined(NP_NO_QUICKDRAW)
@@ -464,7 +464,7 @@
ZGRectf winFrame(winFrameRect.right - winFrameRect.left,
winFrameRect.bottom - winFrameRect.top);
- if (ZLOG(s, eDebug + 1, "Host_WindowRef"))
+ if (ZLOGPF(s, eDebug + 1))
{
s << "kEventWindowDrawContent: " << winFrame;
}
@@ -543,7 +543,7 @@
ZGRectf newFrame = sGetParam_T<Rect>(iEventRef,
kEventParamCurrentBounds, typeQDRectangle);
- if (ZLOG(s, eDebug + 1, "Host_WindowRef"))
+ if (ZLOGPF(s, eDebug + 1))
s << "kEventWindowBoundsChanged"
<< ", newFrame: " << newFrame;
@@ -683,7 +683,7 @@
OSStatus Host_HIViewRef::EventHandler_View(EventHandlerCallRef iCallRef, EventRef iEventRef)
{
- if (ZLOG(s, eDebug + 1, "Host_HIViewRef"))
+ if (ZLOGPF(s, eDebug + 1))
{
s << ZUtil_CarbonEvents::sEventAsString
(::GetEventClass(iEventRef), ::GetEventKind(iEventRef));
@@ -705,12 +705,12 @@
{
case kEventControlActivate:
{
- this->DoActivate(true);
+ Host_Mac::DoActivate(true);
break;
}
case kEventControlDeactivate:
{
- this->DoActivate(false);
+ Host_Mac::DoActivate(false);
break;
}
case kEventControlSetFocusPart:
@@ -748,7 +748,7 @@
theER.modifiers = sGetParam_T<UInt32>(iEventRef,
kEventParamKeyModifiers, typeUInt32);
- if (ZLOG(s, eDebug + 1, "Host_ViewRef"))
+ if (ZLOGPF(s, eDebug + 1))
{
spWriteEvent(s, theER);
}
@@ -761,7 +761,7 @@
::TrackMouseLocationWithOptions
((CGrafPtr)-1, 0, 0.02, &theER.where, &theModifiers, &theResult);
theER.when = ::EventTimeToTicks(::GetCurrentEventTime());
- ZLOG(s, eDebug + 1, "Host_ViewRef");
+ ZLOGPF(s, eDebug + 1);
if (theResult == kMouseTrackingMouseReleased)
{
theER.what = mouseUp;
@@ -797,7 +797,7 @@
ZGRectf winFrame = theFrame;
- if (ZLOG(s, eDebug + 1, "Host_HIViewRef"))
+ if (ZLOGPF(s, eDebug + 1))
s << "draw, winFrame: " << winFrame;
if (fUseCoreGraphics)
@@ -836,7 +836,7 @@
ZGRectf newFrame = sGetParam_T<Rect>(iEventRef,
kEventParamCurrentBounds, typeQDRectangle);
- if (ZLOG(s, eDebug + 1, "Host_HIViewRef"))
+ if (ZLOGPF(s, eDebug + 1))
s << "kEventControlBoundsChanged"
<< ", newFrame1: " << newFrame;
@@ -848,7 +848,7 @@
this->pApplyInsets(newFrame);
- if (ZLOG(s, eDebug + 1, "Host_HIViewRef"))
+ if (ZLOGPF(s, eDebug + 1))
s << "kEventControlBoundsChanged, newFrame2: " << newFrame;
this->DoSetWindow(newFrame);
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp 2011-12-14 20:49:18 UTC (rev 2645)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp 2011-12-14 20:52:46 UTC (rev 2646)
@@ -1074,7 +1074,7 @@
if (countWritten < 0)
{
- if (ZLOG(s, eDebug, "Host"))
+ if (ZLOGPF(s, eDebug))
s << "write failure";
keepGoing = false;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-14 20:49:24
|
Revision: 2645
http://zoolib.svn.sourceforge.net/zoolib/?rev=2645&view=rev
Author: agreen
Date: 2011-12-14 20:49:18 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Use ZQ to indicate success/failure, as Map is no longer a truthy/falsey type.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.h
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2011-12-14 20:48:14 UTC (rev 2644)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2011-12-14 20:49:18 UTC (rev 2645)
@@ -791,17 +791,17 @@
return *this;
}
-Map Spec::Get() const
+ZQ<Map> Spec::QGet() const
{
- Map result;
if (PIActionReference theRef = this->MakeRef())
{
+ Map result;
OSErr theErr = spPSActionControl->Get(&result.OParam(), theRef);
- if (noErr != theErr)
- result.Clear();
spPSActionReference->Free(theRef);
+ if (noErr == theErr)
+ return result;
}
- return result;
+ return null;
}
PIActionReference Spec::MakeRef() const
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.h 2011-12-14 20:48:14 UTC (rev 2644)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.h 2011-12-14 20:49:18 UTC (rev 2645)
@@ -171,7 +171,7 @@
Spec operator+(const Spec& iOther);
Spec& operator+=(const Spec& iOther);
- Map Get() const;
+ ZQ<Map> QGet() const;
PIActionReference MakeRef() const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-14 20:48:20
|
Revision: 2644
http://zoolib.svn.sourceforge.net/zoolib/?rev=2644&view=rev
Author: agreen
Date: 2011-12-14 20:48:14 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Slight change in parsing, so we only return the URL in hostAndPort if there were no slashes in it, so we cans till use this for interpreting CONNECT requests, but can also handle partial URLs.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZHTTP.cpp
Modified: trunk/zoolib/source/cxx/zoolib/ZHTTP.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZHTTP.cpp 2011-12-14 20:47:12 UTC (rev 2643)
+++ trunk/zoolib/source/cxx/zoolib/ZHTTP.cpp 2011-12-14 20:48:14 UTC (rev 2644)
@@ -1339,9 +1339,11 @@
}
string hostAndPort;
- const size_t slashOffset = iURL.find('/', start);
+ size_t slashOffset = iURL.find('/', start);
if (string::npos != slashOffset)
{
+ if (start == 0)
+ slashOffset = 0;
hostAndPort = iURL.substr(start, slashOffset - start);
if (oPath)
*oPath = iURL.substr(min(iURL.size(), slashOffset));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-14 20:47:18
|
Revision: 2643
http://zoolib.svn.sourceforge.net/zoolib/?rev=2643&view=rev
Author: agreen
Date: 2011-12-14 20:47:12 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Haven't needed _REENTRANT since LinuxThreads got superseded.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/zconfigl.h
Modified: trunk/zoolib/source/cxx/zoolib/zconfigl.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/zconfigl.h 2011-12-14 20:46:26 UTC (rev 2642)
+++ trunk/zoolib/source/cxx/zoolib/zconfigl.h 2011-12-14 20:47:12 UTC (rev 2643)
@@ -261,13 +261,6 @@
#endif
// =================================================================================================
-// Define _REENTRANT for all platforms, although it's only significant for POSIX.
-
-#ifndef _REENTRANT
-# define _REENTRANT
-#endif
-
-// =================================================================================================
// Previously we've used 'nil' for the null pointer. With our increasing use of
// Objective C we're switching to use the soon-to-be standardized nullptr.
@@ -293,10 +286,8 @@
void operator&() const;
} nullptr = {};
#endif
-#else
- #ifndef nullptr
- #define nullptr 0
- #endif
+#elif not defined(nullptr)
+ #define nullptr 0
#endif
// =================================================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-14 20:46:32
|
Revision: 2642
http://zoolib.svn.sourceforge.net/zoolib/?rev=2642&view=rev
Author: agreen
Date: 2011-12-14 20:46:26 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Call Unicode variant, otherwise title doesn't handle unicode text.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZWinWND.cpp
Modified: trunk/zoolib/source/cxx/zoolib/ZWinWND.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZWinWND.cpp 2011-12-14 20:45:55 UTC (rev 2641)
+++ trunk/zoolib/source/cxx/zoolib/ZWinWND.cpp 2011-12-14 20:46:26 UTC (rev 2642)
@@ -256,7 +256,7 @@
if (HRSRC theHRSRC = ::FindResourceExW(theHMODULE, (LPCWSTR)RT_DIALOG, lpTemplate, iLCID))
{
HGLOBAL theHGLOBAL = ::LoadResource(theHMODULE, theHRSRC);
- return ::CreateDialogIndirectParam
+ return ::CreateDialogIndirectParamW
(theHMODULE,
(LPCDLGTEMPLATE)::LockResource(theHGLOBAL),
hWndParent,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-14 20:46:01
|
Revision: 2641
http://zoolib.svn.sourceforge.net/zoolib/?rev=2641&view=rev
Author: agreen
Date: 2011-12-14 20:45:55 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Comment.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZQ.h
Modified: trunk/zoolib/source/cxx/zoolib/ZQ.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZQ.h 2011-12-14 20:45:21 UTC (rev 2640)
+++ trunk/zoolib/source/cxx/zoolib/ZQ.h 2011-12-14 20:45:55 UTC (rev 2641)
@@ -34,8 +34,9 @@
#pragma mark * ZQ
// The 'Q' stands for 'Questionable', 'Queryable', 'Quibble' or perhaps 'Quib'
-// c.f. Haskell's Data.Maybe, Scala's Option.
+// c.f. Haskell's 'Data.Maybe', Scala's 'Option'.
+
template <class T, bool Sense = true>
class ZQ
{
@@ -86,60 +87,61 @@
ZQ& operator=(const ZQ& iOther)
{
- if (this != &iOther)
+ if (fHasValue)
{
- if (fHasValue)
+ if (iOther.fHasValue)
{
- if (iOther.fHasValue)
- {
- sAssignFromVoidStar_T<T>(fBytes, iOther.fBytes);
- }
- else
- {
- fHasValue = false;
- sDtor_T<T>(fBytes);
- }
+ sAssignFromVoidStar_T<T>(fBytes, iOther.fBytes);
}
- else if (iOther.fHasValue)
+ else
{
- sCtorFromVoidStar_T<T>(fBytes, iOther.fBytes);
- fHasValue = true;
+ fHasValue = false;
+ sDtor_T<T>(fBytes);
}
}
+ else if (iOther.fHasValue)
+ {
+ sCtorFromVoidStar_T<T>(fBytes, iOther.fBytes);
+ fHasValue = true;
+ }
return *this;
}
// -----------------
- ZQ(const ZQ<T,!Sense>& iOther)
- : fHasValue(iOther.fHasValue)
+ template <class OtherT, bool OtherSense>
+ ZQ(const ZQ<OtherT, OtherSense>& iOther)
{
- if (fHasValue)
- sCtorFromVoidStar_T<T>(fBytes, iOther.fBytes);
+ if (const OtherT* theOther = iOther.PGet())
+ {
+ sCtor_T<T,OtherT>(fBytes, *theOther);
+ fHasValue = true;
+ }
+ else
+ {
+ fHasValue = false;
+ }
}
- ZQ& operator=(const ZQ<T,!Sense>& iOther)
+ template <class OtherT, bool OtherSense>
+ ZQ& operator=(const ZQ<OtherT, OtherSense>& iOther)
{
- if (this != &iOther)
+ if (fHasValue)
{
- if (fHasValue)
+ if (const OtherT* theOther = iOther.PGet())
{
- if (iOther.fHasValue)
- {
- sAssignFromVoidStar_T<T>(fBytes, iOther.fBytes);
- }
- else
- {
- fHasValue = false;
- sDtor_T<T>(fBytes);
- }
+ sAssign_T<T>(fBytes, *theOther);
}
- else if (iOther.fHasValue)
+ else
{
- sCtorFromVoidStar_T<T>(fBytes, iOther.fBytes);
- fHasValue = true;
- }
+ fHasValue = false;
+ sDtor_T<T>(fBytes);
+ }
}
+ else if (const OtherT* theOther = iOther.PGet())
+ {
+ sCtor_T<T,OtherT>(fBytes, *theOther);
+ }
return *this;
}
@@ -285,8 +287,8 @@
{
if (fHasValue)
{
+ fHasValue = false;
sDtor_T<T>(fBytes);
- fHasValue = false;
}
sCtor_T<T>(fBytes);
@@ -302,8 +304,6 @@
#endif
bool fHasValue;
-
- friend class ZQ<T, !Sense>;
};
// =================================================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-14 20:45:28
|
Revision: 2640
http://zoolib.svn.sourceforge.net/zoolib/?rev=2640&view=rev
Author: agreen
Date: 2011-12-14 20:45:21 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Use the worker's Detach callable to manage notification of completion. If fCallable_Connection propagated and exception then the prior mechanism would break.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZServer.cpp
trunk/zoolib/source/cxx/zoolib/ZServer.h
Modified: trunk/zoolib/source/cxx/zoolib/ZServer.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZServer.cpp 2011-12-14 20:42:34 UTC (rev 2639)
+++ trunk/zoolib/source/cxx/zoolib/ZServer.cpp 2011-12-14 20:45:21 UTC (rev 2640)
@@ -38,8 +38,8 @@
void ZServer::Finalize()
{
ZGuardRMtx guard(fMtx);
- ZAssert(!fWorker);
- ZAssert(!fFactory);
+ ZAssert(not fWorker);
+ ZAssert(not fFactory);
fRoster.Clear();
fCallable_Connection.Clear();
guard.Release();
@@ -70,7 +70,9 @@
fFactory = iFactory;
fCallable_Connection = iCallable_Connection;
- fWorker = new ZWorker(sCallable(sWeakRef(this), &ZServer::pWork));
+ fWorker = new ZWorker
+ (sCallable(sWeakRef(this), &ZServer::pWork),
+ sCallable(sWeakRef(this), &ZServer::pWorkDetached));
fWorker->Attach(iCaller);
@@ -92,14 +94,19 @@
void ZServer::StopWait()
{
ZAcqMtx acq(fMtx);
+
if (ZRef<ZStreamerRWFactory> theFactory = fFactory)
{
fFactory.Clear();
theFactory->Cancel();
}
- fCnd.Broadcast();
- while (fWorker)
- fCnd.Wait(fMtx);
+
+ if (fWorker)
+ {
+ fWorker->Wake();
+ while (fWorker)
+ fCnd.Wait(fMtx);
+ }
}
void ZServer::KillConnections()
@@ -139,30 +146,36 @@
{
ZGuardRMtx guard(fMtx);
- if (ZRef<ZStreamerRWFactory,false> theFactory = fFactory)
+ if (ZRef<ZStreamerRWFactory> theFactory = fFactory)
{
- fWorker.Clear();
- fCnd.Broadcast();
- return false;
- }
- else
- {
guard.Release();
if (ZRef<ZStreamerRW> theSRW = theFactory->MakeStreamerRW())
{
guard.Acquire();
if (ZRef<Callable_Connection> theCallable = fCallable_Connection)
{
- ZRef<ZStreamerRWCon> theSRWCon = theSRW.DynamicCast<ZStreamerRWCon>();
- ZRef<ZRoster::Entry> theEntry =
- fRoster->MakeEntry(sBindR(sCallable(spKill), theSRWCon), null);
guard.Release();
- theCallable->Call(theEntry, theSRW);
+ try
+ {
+ ZRef<ZCallable_Void> theCallable_Kill =
+ sBindR(sCallable(spKill), theSRW.DynamicCast<ZStreamerRWCon>());
+ theCallable->Call(fRoster->MakeEntry(theCallable_Kill, null), theSRW);
+ }
+ catch (...)
+ {}
}
}
+ iWorker->Wake();
+ return true;
}
- iWorker->Wake();
- return true;
+ return false;
}
+void ZServer::pWorkDetached(ZRef<ZWorker> iWorker)
+ {
+ ZAcqMtx acq(fMtx);
+ fWorker.Clear();
+ fCnd.Broadcast();
+ }
+
} // namespace ZooLib
Modified: trunk/zoolib/source/cxx/zoolib/ZServer.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZServer.h 2011-12-14 20:42:34 UTC (rev 2639)
+++ trunk/zoolib/source/cxx/zoolib/ZServer.h 2011-12-14 20:45:21 UTC (rev 2640)
@@ -62,6 +62,7 @@
private:
bool pWork(ZRef<ZWorker> iWorker);
+ void pWorkDetached(ZRef<ZWorker> iWorker);
ZMtx fMtx;
ZCnd fCnd;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-14 20:42:40
|
Revision: 2639
http://zoolib.svn.sourceforge.net/zoolib/?rev=2639&view=rev
Author: agreen
Date: 2011-12-14 20:42:34 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Let the waiter thread exit when there's no pending jobs, so ZThread::sWaitTillAllThreadsExit doesn't block.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZCallScheduler.cpp
trunk/zoolib/source/cxx/zoolib/ZCallScheduler.h
Modified: trunk/zoolib/source/cxx/zoolib/ZCallScheduler.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCallScheduler.cpp 2011-12-14 20:41:10 UTC (rev 2638)
+++ trunk/zoolib/source/cxx/zoolib/ZCallScheduler.cpp 2011-12-14 20:42:34 UTC (rev 2639)
@@ -27,18 +27,26 @@
// =================================================================================================
#pragma mark -
-#pragma mark * ZCallScheduler
+#pragma mark * Helpers
static ZCallScheduler* spScheduler;
+namespace { // anonymous
+
+struct Deleter { ~Deleter() { delete spScheduler; } } spDeleter;
+
+} // anonymous namespace
+
+// =================================================================================================
+#pragma mark -
+#pragma mark * ZCallScheduler
+
ZCallScheduler* ZCallScheduler::sGet()
{
- if (!spScheduler)
+ if (not spScheduler)
{
ZCallScheduler* theScheduler = new ZCallScheduler;
- if (ZAtomic_CompareAndSwapPtr(&spScheduler, nullptr, theScheduler))
- ZThread::sCreate_T<ZCallScheduler*>(spRun, theScheduler);
- else
+ if (not ZAtomic_CompareAndSwapPtr(&spScheduler, nullptr, theScheduler))
delete theScheduler;
}
return spScheduler;
@@ -48,7 +56,7 @@
{
using namespace ZUtil_STL;
- ZAcqMtxR acq(fMtxR);
+ ZAcqMtx acq(fMtx);
const Job theJob(iCaller, iCallable);
@@ -70,7 +78,7 @@
bool ZCallScheduler::IsAwake(const ZRef<ZCaller>& iCaller, const ZRef<ZCallable_Void>& iCallable)
{
- ZAcqMtxR acq(fMtxR);
+ ZAcqMtx acq(fMtx);
const Job theJob(iCaller, iCallable);
@@ -81,11 +89,15 @@
return false;
}
+ZCallScheduler::ZCallScheduler()
+: fThreadRunning(false)
+ {}
+
void ZCallScheduler::pNextCallAt(ZTime iSystemTime, const Job& iJob)
{
using namespace ZUtil_STL;
- ZAcqMtxR acq(fMtxR);
+ ZAcqMtx acq(fMtx);
set<JobTime>::iterator iterJT = fJobTimes.lower_bound(make_pair(iJob, 0.0));
if (iterJT != fJobTimes.end() && iterJT->first == iJob)
@@ -104,6 +116,11 @@
{
sInsertMustNotContain(fJobTimes, make_pair(iJob, iSystemTime));
sInsertMustNotContain(fTimeJobs, make_pair(iSystemTime, iJob));
+ if (not fThreadRunning)
+ {
+ fThreadRunning = true;
+ ZThread::sCreate_T<ZCallScheduler*>(spRun, this);
+ }
fCnd.Broadcast();
}
}
@@ -112,12 +129,19 @@
{
using namespace ZUtil_STL;
- ZGuardRMtxR guard(fMtxR);
+ ZGuardRMtx guard(fMtx);
for (;;)
{
if (fTimeJobs.empty())
{
- fCnd.Wait(fMtxR);
+ // Nothing pending, wait 100ms in case something else comes along.
+ fCnd.WaitFor(fMtx, 0.1);
+ if (fTimeJobs.empty())
+ {
+ // Still nothing pending, exit thread.
+ fThreadRunning = false;
+ break;
+ }
}
else
{
@@ -125,7 +149,7 @@
const double delta = begin->first - ZTime::sSystem();
if (delta > 0)
{
- fCnd.WaitFor(fMtxR, delta);
+ fCnd.WaitFor(fMtx, delta);
}
else
{
Modified: trunk/zoolib/source/cxx/zoolib/ZCallScheduler.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCallScheduler.h 2011-12-14 20:41:10 UTC (rev 2638)
+++ trunk/zoolib/source/cxx/zoolib/ZCallScheduler.h 2011-12-14 20:42:34 UTC (rev 2639)
@@ -51,6 +51,8 @@
bool IsAwake(const ZRef<ZCaller>& iCaller, const ZRef<ZCallable_Void>& iCallable);
private:
+ ZCallScheduler();
+
typedef std::pair<ZRef<ZCaller>,ZRef<ZCallable_Void> > Job;
void pNextCallAt(ZTime iSystemTime, const Job& iJob);
@@ -58,9 +60,11 @@
void pRun();
static void spRun(ZCallScheduler*);
- ZMtxR fMtxR;
+ ZMtx fMtx;
ZCnd fCnd;
+ bool fThreadRunning;
+
typedef std::pair<ZTime,Job> TimeJob;
typedef std::pair<Job,ZTime> JobTime;
std::set<TimeJob> fTimeJobs;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-14 20:41:16
|
Revision: 2638
http://zoolib.svn.sourceforge.net/zoolib/?rev=2638&view=rev
Author: agreen
Date: 2011-12-14 20:41:10 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Disable MSVC warning only for the code that it affects.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZCtorDtor.h
Modified: trunk/zoolib/source/cxx/zoolib/ZCtorDtor.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCtorDtor.h 2011-12-08 08:26:42 UTC (rev 2637)
+++ trunk/zoolib/source/cxx/zoolib/ZCtorDtor.h 2011-12-14 20:41:10 UTC (rev 2638)
@@ -32,10 +32,17 @@
inline T* sCtor_T(void* oBytes)
{
#if ZCONFIG(Compiler,MSVC)
+ // We *want* POD types to be default initialized.
+ #pragma warning(push)
#pragma warning(disable:4345)
- // We *want* POD types to be default initialized.
#endif
+
new(oBytes) T();
+
+#if ZCONFIG(Compiler,MSVC)
+ #pragma warning(pop)
+#endif
+
return static_cast<T*>(oBytes);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-12-08 08:26:48
|
Revision: 2637
http://zoolib.svn.sourceforge.net/zoolib/?rev=2637&view=rev
Author: agreen
Date: 2011-12-08 08:26:42 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
Comment.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZQ.h
Modified: trunk/zoolib/source/cxx/zoolib/ZQ.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZQ.h 2011-12-08 08:26:29 UTC (rev 2636)
+++ trunk/zoolib/source/cxx/zoolib/ZQ.h 2011-12-08 08:26:42 UTC (rev 2637)
@@ -33,7 +33,7 @@
#pragma mark -
#pragma mark * ZQ
-// The 'Q' stands for 'Questionable' or 'Queryable'
+// The 'Q' stands for 'Questionable', 'Queryable', 'Quibble' or perhaps 'Quib'
// c.f. Haskell's Data.Maybe, Scala's Option.
template <class T, bool Sense = true>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
