[hydra-commits] beagles: branch ice/hydra-modified-ice r666 - in /ice/branches/hydra-modified...

SVN commits to the Hydra project hydra-commits at lists.digium.com
Mon Jun 7 09:59:12 CDT 2010


Author: beagles
Date: Mon Jun  7 09:59:11 2010
New Revision: 666

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=666
Log:
Merged https://origsvn.digium.com/svn/hydra/ice/branches/preserve-graphs 619:665

Added:
    ice/branches/hydra-modified-ice/cpp/include/Ice/SliceHolder.h
      - copied, changed from r618, ice/branches/slice-preserving-translators/cpp/include/Ice/SliceHolder.h
    ice/branches/hydra-modified-ice/cpp/src/Ice/SliceHolder.cpp
      - copied, changed from r618, ice/branches/slice-preserving-translators/cpp/src/Ice/SliceHolder.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice
      - copied, changed from r582, ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice
    ice/branches/hydra-modified-ice/cs/src/Ice/ObjectPatcher.cs
      - copied unchanged from r664, ice/branches/preserve-graphs/cs/src/Ice/ObjectPatcher.cs
    ice/branches/hydra-modified-ice/cs/src/Ice/SkippedSlice.cs
      - copied unchanged from r664, ice/branches/preserve-graphs/cs/src/Ice/SkippedSlice.cs
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/exceptions/ClientPrivate.ice
      - copied unchanged from r664, ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/ClientPrivate.ice
    ice/branches/hydra-modified-ice/java/src/Ice/ObjectPatcher.java
      - copied unchanged from r664, ice/branches/preserve-graphs/java/src/Ice/ObjectPatcher.java
    ice/branches/hydra-modified-ice/java/src/Ice/SkippedSlice.java
      - copied unchanged from r664, ice/branches/preserve-graphs/java/src/Ice/SkippedSlice.java
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/exceptions/ClientPrivate.ice
      - copied unchanged from r665, ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/ClientPrivate.ice
    ice/branches/hydra-modified-ice/slice/Ice/Preserve.ice
      - copied unchanged from r664, ice/branches/preserve-graphs/slice/Ice/Preserve.ice
Removed:
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/exceptions/Test.ice
Modified:
    ice/branches/hydra-modified-ice/   (props changed)
    ice/branches/hydra-modified-ice/Makefile.mak   (props changed)
    ice/branches/hydra-modified-ice/cpp/demo/Ice/value/Value.ice
    ice/branches/hydra-modified-ice/cpp/include/Ice/BasicStream.h
    ice/branches/hydra-modified-ice/cpp/include/Ice/Exception.h
    ice/branches/hydra-modified-ice/cpp/include/Slice/CPlusPlusUtil.h
    ice/branches/hydra-modified-ice/cpp/include/Slice/CsUtil.h
    ice/branches/hydra-modified-ice/cpp/include/Slice/JavaUtil.h
    ice/branches/hydra-modified-ice/cpp/include/Slice/Parser.h
    ice/branches/hydra-modified-ice/cpp/src/Freeze/.depend
    ice/branches/hydra-modified-ice/cpp/src/Freeze/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/FreezeScript/.depend
    ice/branches/hydra-modified-ice/cpp/src/FreezeScript/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/Glacier2/.depend
    ice/branches/hydra-modified-ice/cpp/src/Glacier2/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/Glacier2Lib/.depend
    ice/branches/hydra-modified-ice/cpp/src/Glacier2Lib/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/Ice/.depend
    ice/branches/hydra-modified-ice/cpp/src/Ice/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/Ice/BasicStream.cpp
    ice/branches/hydra-modified-ice/cpp/src/Ice/Makefile
    ice/branches/hydra-modified-ice/cpp/src/Ice/Makefile.mak
    ice/branches/hydra-modified-ice/cpp/src/IceBox/.depend
    ice/branches/hydra-modified-ice/cpp/src/IceBox/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/IceBox/ServiceManagerI.cpp   (contents, props changed)
    ice/branches/hydra-modified-ice/cpp/src/IceBox/ServiceManagerI.h   (contents, props changed)
    ice/branches/hydra-modified-ice/cpp/src/IceGrid/.depend
    ice/branches/hydra-modified-ice/cpp/src/IceGrid/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/IceGrid/FreezeDB/.depend
    ice/branches/hydra-modified-ice/cpp/src/IceGrid/FreezeDB/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/IceGridLib/.depend
    ice/branches/hydra-modified-ice/cpp/src/IceGridLib/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/IcePatch2/.depend
    ice/branches/hydra-modified-ice/cpp/src/IcePatch2/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/IcePatch2Lib/.depend
    ice/branches/hydra-modified-ice/cpp/src/IcePatch2Lib/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/IceSSL/.depend
    ice/branches/hydra-modified-ice/cpp/src/IceSSL/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/IceStorm/.depend
    ice/branches/hydra-modified-ice/cpp/src/IceStorm/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/IceStorm/FreezeDB/.depend
    ice/branches/hydra-modified-ice/cpp/src/IceStorm/FreezeDB/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/IceStormLib/.depend
    ice/branches/hydra-modified-ice/cpp/src/IceStormLib/.depend.mak
    ice/branches/hydra-modified-ice/cpp/src/Slice/CPlusPlusUtil.cpp
    ice/branches/hydra-modified-ice/cpp/src/Slice/CsUtil.cpp
    ice/branches/hydra-modified-ice/cpp/src/Slice/JavaUtil.cpp
    ice/branches/hydra-modified-ice/cpp/src/Slice/Parser.cpp
    ice/branches/hydra-modified-ice/cpp/src/slice2cpp/Gen.cpp
    ice/branches/hydra-modified-ice/cpp/src/slice2cs/Gen.cpp
    ice/branches/hydra-modified-ice/cpp/src/slice2java/Gen.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/AllTests.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/Makefile
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/Makefile.mak
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/Server.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/Test.ice
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/TestAMD.ice
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/TestAMDI.h
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/TestI.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/exceptions/TestI.h
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/objects/AllTests.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/objects/ClientPrivate.ice
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/objects/Server.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/objects/ServerAMD.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/objects/Test.ice
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/objects/TestAMD.ice
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/objects/TestAMDI.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/objects/TestAMDI.h
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/objects/TestI.cpp
    ice/branches/hydra-modified-ice/cpp/test/Ice/slicing/objects/TestI.h
    ice/branches/hydra-modified-ice/cs/src/Ice/.depend
    ice/branches/hydra-modified-ice/cs/src/Ice/.depend.mak
    ice/branches/hydra-modified-ice/cs/src/Ice/BasicStream.cs
    ice/branches/hydra-modified-ice/cs/src/Ice/Makefile
    ice/branches/hydra-modified-ice/cs/src/Ice/Makefile.mak
    ice/branches/hydra-modified-ice/cs/src/IceBox/ServiceManagerI.cs   (contents, props changed)
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/exceptions/AllTests.cs
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/exceptions/Makefile
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/exceptions/Makefile.mak
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/exceptions/Test.ice
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/exceptions/TestAMD.ice
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/exceptions/TestAMDI.cs
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/exceptions/TestI.cs
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/objects/AllTests.cs
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/objects/ClientPrivate.ice
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/objects/Server.cs
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/objects/Test.ice
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/objects/TestAMD.ice
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/objects/TestAMDI.cs
    ice/branches/hydra-modified-ice/cs/test/Ice/slicing/objects/TestI.cs
    ice/branches/hydra-modified-ice/java/build.xml
    ice/branches/hydra-modified-ice/java/src/IceBox/ServiceManagerI.java   (contents, props changed)
    ice/branches/hydra-modified-ice/java/src/IceInternal/BasicStream.java
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/exceptions/   (props changed)
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/exceptions/AMDTestI.java
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/exceptions/AllTests.java
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/exceptions/Client.java
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/exceptions/ServerPrivate.ice
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/exceptions/TestI.java
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/objects/AMDTestI.java
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/objects/AllTests.java
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/objects/ClientPrivate.ice
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/objects/ServerPrivate.ice
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/objects/ServerPrivateAMD.ice
    ice/branches/hydra-modified-ice/java/test/Ice/slicing/objects/TestI.java
    ice/branches/hydra-modified-ice/scripts/TestUtil.py   (props changed)
    ice/branches/hydra-modified-ice/slice/IceBox/IceBox.ice   (contents, props changed)

Propchange: ice/branches/hydra-modified-ice/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun  7 09:59:11 2010
@@ -1,3 +1,6 @@
-/ice/branches/icebox-local:149-423
+/ice/branches/preserve-graphs:619-664
+/ice/branches/skipped-slice-recovery:565-582
+/ice/branches/slice-preserving-translators:583-618
 /ice/branches/slice-translator-versioning:645-663
-/ice/upstream/3.4.0:509-510,607
+/ice/upstream/3.4.0:509-608
+/ice/upstream/3.4b:362-508

Propchange: ice/branches/hydra-modified-ice/Makefile.mak
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun  7 09:59:11 2010
@@ -1,5 +1,6 @@
 /ice/branches/icebox-local/Makefile.mak:149-423
+/ice/branches/preserve-graphs/Makefile.mak:619-664
 /ice/branches/skipped-slice-recovery/Makefile.mak:565-582
-/ice/branches/slice-preserving-translators/Makefile.mak:583-599
+/ice/branches/slice-preserving-translators/Makefile.mak:583-618
 /ice/branches/slice-translator-versioning/Makefile.mak:645-663
 /ice/upstream/3.4.0/Makefile.mak:509-510

Modified: ice/branches/hydra-modified-ice/cpp/demo/Ice/value/Value.ice
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/hydra-modified-ice/cpp/demo/Ice/value/Value.ice?view=diff&rev=666&r1=665&r2=666
==============================================================================
--- ice/branches/hydra-modified-ice/cpp/demo/Ice/value/Value.ice (original)
+++ ice/branches/hydra-modified-ice/cpp/demo/Ice/value/Value.ice Mon Jun  7 09:59:11 2010
@@ -30,6 +30,7 @@
     void printUppercase();
 };
 
+["preserve"]
 exception DerivedPrinterException
 {
     DerivedPrinter derived;

Modified: ice/branches/hydra-modified-ice/cpp/include/Ice/BasicStream.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/hydra-modified-ice/cpp/include/Ice/BasicStream.h?view=diff&rev=666&r1=665&r2=666
==============================================================================
--- ice/branches/hydra-modified-ice/cpp/include/Ice/BasicStream.h (original)
+++ ice/branches/hydra-modified-ice/cpp/include/Ice/BasicStream.h Mon Jun  7 09:59:11 2010
@@ -16,6 +16,7 @@
 #include <Ice/ObjectFactoryF.h>
 #include <Ice/Buffer.h>
 #include <Ice/Protocol.h>
+#include <Ice/SliceHolder.h>
 
 namespace Ice
 {
@@ -177,6 +178,7 @@
         _currentReadEncaps->encodingMajor = eMajor;
         _currentReadEncaps->encodingMinor = eMinor;
     }
+
     void endReadEncaps()
     {
         assert(_currentReadEncaps);
@@ -209,6 +211,7 @@
             delete oldEncaps;
         }
     }
+
     void skipEmptyEncaps()
     {
         Ice::Int sz;
@@ -224,6 +227,7 @@
         }
         i += 2;
     }
+
     void endReadEncapsChecked(); // Used by public stream API.
 
     Ice::Int getReadEncapsSize();
@@ -231,10 +235,13 @@
 
     void startWriteSlice();
     void endWriteSlice();
+    Ice::Int getWriteSliceOffset();
 
     void startReadSlice();
     void endReadSlice();
     void skipSlice();
+
+    void skipSlice(const std::string& typeName);
 
     void writeSize(Ice::Int v) // Inlined for performance reasons.
     {
@@ -301,6 +308,8 @@
     void writeBlob(const std::vector<Ice::Byte>&);
     void readBlob(std::vector<Ice::Byte>&, Ice::Int);
 
+    void getSkippedSlices(std::vector<Ice::SkippedSlice>&);
+
     void writeBlob(const Ice::Byte* v, Container::size_type sz)
     {
         if(sz > 0)
@@ -503,7 +512,7 @@
     void write(const Ice::ObjectPrx&);
     void read(Ice::ObjectPrx&);
 
-    void write(const Ice::ObjectPtr&);
+    Ice::Int write(const Ice::ObjectPtr&);
     void read(PatchFunc, void*);
 
     void write(const Ice::UserException&);
@@ -513,6 +522,13 @@
     void readPendingObjects();
 
     void sliceObjects(bool);
+    //
+    // Allows an external object patch to occur without requiring an id to be written 
+    // from the stream. Uses the internal patchPreserved patcher to assign the appropriate
+    // addresses.
+    //
+    void addPreservedPatcher(void*, Ice::Int);
+    Ice::Int addPendingObject(const Ice::ObjectPtr&);
 
     struct PatchEntry 
     {
@@ -648,6 +664,10 @@
     Container::size_type _readSlice;
     Container::size_type _writeSlice;
 
+    Container::iterator _currentObjectStart;
+
+    std::vector<Ice::SkippedSlice> _skippedSlices;
+
     void writeInstance(const Ice::ObjectPtr&, Ice::Int);
     void patchPointers(Ice::Int, IndexToPtrMap::const_iterator, PatchMap::iterator);
 

Modified: ice/branches/hydra-modified-ice/cpp/include/Ice/Exception.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/hydra-modified-ice/cpp/include/Ice/Exception.h?view=diff&rev=666&r1=665&r2=666
==============================================================================
--- ice/branches/hydra-modified-ice/cpp/include/Ice/Exception.h (original)
+++ ice/branches/hydra-modified-ice/cpp/include/Ice/Exception.h Mon Jun  7 09:59:11 2010
@@ -44,7 +44,6 @@
     virtual Exception* ice_clone() const = 0;
     virtual void ice_throw() const = 0;
 };
-
 
 class ICE_API UserException : public IceUtil::Exception
 {

Copied: ice/branches/hydra-modified-ice/cpp/include/Ice/SliceHolder.h (from r618, ice/branches/slice-preserving-translators/cpp/include/Ice/SliceHolder.h)
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/hydra-modified-ice/cpp/include/Ice/SliceHolder.h?view=diff&rev=666&p1=ice/branches/slice-preserving-translators/cpp/include/Ice/SliceHolder.h&r1=618&p2=ice/branches/hydra-modified-ice/cpp/include/Ice/SliceHolder.h&r2=666
==============================================================================
--- ice/branches/slice-preserving-translators/cpp/include/Ice/SliceHolder.h (original)
+++ ice/branches/hydra-modified-ice/cpp/include/Ice/SliceHolder.h Mon Jun  7 09:59:11 2010
@@ -2,35 +2,32 @@
 #define ICE_SLICE_HOLDER_H
 
 #include <Ice/Config.h>
+#include <Ice/ObjectF.h>
 #include <vector>
 #include <string>
 
 namespace Ice
 {
     
-struct SkippedSlice
+struct ICE_API SkippedSlice
 {
     std::string typeId;
     std::vector< ::Ice::Byte > slice;
 };
 
-struct SlicedObject
+void ICE_API updateObjectId(std::vector<Byte>&, const Ice::Int, const Ice::Int);
+
+//
+// The patcher allows us to dynamically instantiate a object handle so its address
+// remains fixed during the read/patch process.
+//
+struct ICE_API ObjectPatcher : public IceUtil::Shared
 {
-    Int id;
-    std::vector<SkippedSlice> slices;
+    ObjectPtr obj;
 };
 
-class ICE_API SlicedObjectsHolder
-{
-public:
-    virtual ~SlicedObjectsHolder() {}
-
-    virtual void store(std::vector<SlicedObject>&);
-    virtual const std::vector<SlicedObject>& get() const;
-
-protected:
-    std::vector<SlicedObject> _extra;
-};
+typedef IceUtil::Handle<ObjectPatcher> ObjectPatcherPtr;
+typedef std::map<Ice::Int, ObjectPatcherPtr> PreservedObjectMap;
 
 }
 

Modified: ice/branches/hydra-modified-ice/cpp/include/Slice/CPlusPlusUtil.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/hydra-modified-ice/cpp/include/Slice/CPlusPlusUtil.h?view=diff&rev=666&r1=665&r2=666
==============================================================================
--- ice/branches/hydra-modified-ice/cpp/include/Slice/CPlusPlusUtil.h (original)
+++ ice/branches/hydra-modified-ice/cpp/include/Slice/CPlusPlusUtil.h Mon Jun  7 09:59:11 2010
@@ -44,7 +44,7 @@
 
 SLICE_API void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool,
                                          const std::string& = "", bool = true, const StringList& = StringList(),
-                                         int = 0);
+                                         int = 0, bool = false);
                                              
 SLICE_API void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const TypePtr&, 
                                 const StringList&, int = 0);

Modified: ice/branches/hydra-modified-ice/cpp/include/Slice/CsUtil.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/hydra-modified-ice/cpp/include/Slice/CsUtil.h?view=diff&rev=666&r1=665&r2=666
==============================================================================
--- ice/branches/hydra-modified-ice/cpp/include/Slice/CsUtil.h (original)
+++ ice/branches/hydra-modified-ice/cpp/include/Slice/CsUtil.h Mon Jun  7 09:59:11 2010
@@ -42,7 +42,7 @@
     // Generate code to marshal or unmarshal a type
     //
     void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool, bool,
-                                   bool, const std::string& = "", bool = false);
+                                   bool, const std::string& = "", bool = false, bool = false);
     void writeSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const SequencePtr&, const std::string&,
                                            bool, bool);
 

Modified: ice/branches/hydra-modified-ice/cpp/include/Slice/JavaUtil.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/hydra-modified-ice/cpp/include/Slice/JavaUtil.h?view=diff&rev=666&r1=665&r2=666
==============================================================================
--- ice/branches/hydra-modified-ice/cpp/include/Slice/JavaUtil.h (original)
+++ ice/branches/hydra-modified-ice/cpp/include/Slice/JavaUtil.h Mon Jun  7 09:59:11 2010
@@ -127,7 +127,7 @@
     //
     void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const TypePtr&, const std::string&,
                                    bool, int&, bool = false, const StringList& = StringList(),
-                                   const std::string& patchParams = "");
+                                   const std::string& patchParams = "", bool = false);
 
     //
     // Generate code to marshal or unmarshal a dictionary type.

Modified: ice/branches/hydra-modified-ice/cpp/include/Slice/Parser.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/hydra-modified-ice/cpp/include/Slice/Parser.h?view=diff&rev=666&r1=665&r2=666
==============================================================================
--- ice/branches/hydra-modified-ice/cpp/include/Slice/Parser.h (original)
+++ ice/branches/hydra-modified-ice/cpp/include/Slice/Parser.h Mon Jun  7 09:59:11 2010
@@ -177,6 +177,9 @@
 #if defined(__SUNPRO_CC)
 SLICE_API bool derivedToBaseCompare(const ExceptionPtr&, const ExceptionPtr&);
 #endif
+
+SLICE_API bool scanParentsMetaData(const ClassDefPtr&, const std::string&, std::string&);
+SLICE_API bool scanParentsMetaData(const ExceptionPtr&, const std::string&, std::string&);
 
 // ----------------------------------------------------------------------
 // ParserVisitor

Modified: ice/branches/hydra-modified-ice/cpp/src/Freeze/.depend
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/hydra-modified-ice/cpp/src/Freeze/.depend?view=diff&rev=666&r1=665&r2=666
==============================================================================
--- ice/branches/hydra-modified-ice/cpp/src/Freeze/.depend (original)
+++ ice/branches/hydra-modified-ice/cpp/src/Freeze/.depend Mon Jun  7 09:59:11 2010
@@ -1,30 +1,30 @@
-BackgroundSaveEvictor$(OBJEXT): BackgroundSaveEvictor.cpp $(includedir)/Freeze/BackgroundSaveEvictor.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StreamF.h $(includedir)/Freeze/Evictor.h $(includedir)/Ice/ServantLocator.h $(includedir)/Freeze/Exception.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/DisableWarnings.h
-BackgroundSaveEvictorI$(OBJEXT): BackgroundSaveEvictorI.cpp ../Freeze/BackgroundSaveEvictorI.h ../Freeze/EvictorI.h $(includedir)/IceUtil/IceUtil.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/AbstractMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Cache.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/IceUtil/CountDownLatch.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/MutexPtrLock.h $(includedir)/IceUtil/RWRecMutex.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/CommunicatorAsync.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/ConnectionAsync.h $(includedir)/Ice/Functional.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/Freeze/Freeze.h $(includedir)/Freeze/Initialize.h $(includedir)/Freeze/EvictorF.h $(includedir)/Freeze/ConnectionF.h $(includedir)/Freeze/Index.h $(includedir)/Freeze/DB.h $(includedir)/Freeze/Transaction.h $(includedir)/Freeze/BackgroundSaveEvictor.h $(includedir)/Freeze/Evictor.h $(includedir)/Freeze/Exception.h $(includedir)/Freeze/TransactionalEvictor.h $(includedir)/Freeze/Map.h $(includedir)/Freeze/Connection.h $(includedir)/Freeze/TransactionHolder.h $(includedir)/Freeze/Catalog.h $(includedir)/Freeze/CatalogData.h ../Freeze/ObjectStore.h $(includedir)/Freeze/EvictorStorage.h ../Freeze/TransactionI.h ../Freeze/EvictorIteratorI.h ../Freeze/SharedDbEnv.h $(includedir)/IceUtil/FileUtil.h $(includedir)/IceUtil/DisableWarnings.h $(includedir)/IceUtil/StringUtil.h ../Freeze/Util.h
-CatalogData$(OBJEXT): CatalogData.cpp $(includedir)/Freeze/CatalogData.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/Object.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/DisableWarnings.h
-Catalog$(OBJEXT): Catalog.cpp $(includedir)/Ice/BasicStream.h $(includedir)/Ice/InstanceF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/StringUtil.h $(includedir)/Freeze/Catalog.h $(includedir)/Freeze/Map.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/CommunicatorAsync.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/ConnectionAsync.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/Freeze/DB.h $(includedir)/Freeze/Exception.h $(includedir)/Freeze/Connection.h $(includedir)/Freeze/Transaction.h $(includedir)/Freeze/CatalogData.h
-CatalogIndexList$(OBJEXT): CatalogIndexList.cpp $(includedir)/Ice/BasicStream.h $(includedir)/Ice/InstanceF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/StringUtil.h $(includedir)/Freeze/CatalogIndexList.h $(includedir)/Freeze/Map.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/CommunicatorAsync.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/ConnectionAsync.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/Freeze/DB.h $(includedir)/Freeze/Exception.h $(includedir)/Freeze/Connection.h $(includedir)/Freeze/Transaction.h
-ConnectionI$(OBJEXT): ConnectionI.cpp ../Freeze/ConnectionI.h $(includedir)/Freeze/Connection.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/Freeze/Transaction.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Freeze/Initialize.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/CommunicatorAsync.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/ConnectionAsync.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/Freeze/EvictorF.h $(includedir)/Freeze/ConnectionF.h $(includedir)/Freeze/Index.h $(includedir)/Freeze/DB.h ../Freeze/TransactionI.h ../Freeze/SharedDbEnv.h $(includedir)/Freeze/Map.h $(includedir)/Freeze/Exception.h $(includedir)/IceUtil/FileUtil.h ../Freeze/MapI.h
-Connection$(OBJEXT): Connection.cpp $(includedir)/Freeze/Connection.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/Freeze/Transaction.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/CommunicatorF.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/DisableWarnings.h

[... 8252 lines stripped ...]




More information about the asterisk-scf-commits mailing list