diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-06-09 10:07:52 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-06-09 10:07:52 +0000 |
| commit | 112d2b670badf587a9ac457fe5efc11e5b7b545c (patch) | |
| tree | 27d62478df594c0964b8c159f22e07d379490a25 /cpp/src | |
| parent | Added allocatables (diff) | |
| download | ice-112d2b670badf587a9ac457fe5efc11e5b7b545c.tar.bz2 ice-112d2b670badf587a9ac457fe5efc11e5b7b545c.tar.xz ice-112d2b670badf587a9ac457fe5efc11e5b7b545c.zip | |
Win32 fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/AllocatableObjectCache.cpp | 6 | ||||
| -rwxr-xr-x | cpp/src/IceGrid/icegridnode.dsp | 12 | ||||
| -rwxr-xr-x | cpp/src/IceGrid/icegridregistry.dsp | 12 |
3 files changed, 20 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.cpp b/cpp/src/IceGrid/AllocatableObjectCache.cpp index 78bac949bbf..9315725edf0 100644 --- a/cpp/src/IceGrid/AllocatableObjectCache.cpp +++ b/cpp/src/IceGrid/AllocatableObjectCache.cpp @@ -273,7 +273,8 @@ AllocatableObjectEntry::allocated(const SessionIPtr& session) if(traceLevels && traceLevels->object > 1) { Ice::Trace out(traceLevels->logger, traceLevels->objectCat); - out << "object `" << _info.proxy << "' allocated by `" << session->getId() << "' (" << _count << ")"; + out << "object `" << _info.proxy->ice_toString() << "' allocated by `" << session->getId() << "' (" << _count + << ")"; } Glacier2::SessionControlPrx ctl = session->getSessionControl(); @@ -317,7 +318,8 @@ AllocatableObjectEntry::released(const SessionIPtr& session) if(traceLevels && traceLevels->object > 1) { Ice::Trace out(traceLevels->logger, traceLevels->objectCat); - out << "object `" << _info.proxy << "' released by `" << session->getId() << "' (" << _count << ")"; + out << "object `" << _info.proxy->ice_toString() << "' released by `" << session->getId() << "' (" << _count + << ")"; } } diff --git a/cpp/src/IceGrid/icegridnode.dsp b/cpp/src/IceGrid/icegridnode.dsp index 2b2d77cb037..beaf8ea6875 100755 --- a/cpp/src/IceGrid/icegridnode.dsp +++ b/cpp/src/IceGrid/icegridnode.dsp @@ -122,6 +122,10 @@ SOURCE=.\Allocatable.cpp # End Source File
# Begin Source File
+SOURCE=.\AllocatableObjectCache.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Database.cpp
# End Source File
# Begin Source File
@@ -138,6 +142,10 @@ SOURCE=.\DescriptorParser.cpp # End Source File
# Begin Source File
+SOURCE=.\FileUserAccountMapperI.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\icegridnode.cpp
# End Source File
# Begin Source File
@@ -234,10 +242,6 @@ SOURCE=.\Util.cpp # End Source File
# Begin Source File
-SOURCE=.\FileUserAccountMapperI.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\WaitQueue.cpp
# End Source File
# End Group
diff --git a/cpp/src/IceGrid/icegridregistry.dsp b/cpp/src/IceGrid/icegridregistry.dsp index 2f6f926fb89..c40774abc2b 100755 --- a/cpp/src/IceGrid/icegridregistry.dsp +++ b/cpp/src/IceGrid/icegridregistry.dsp @@ -119,6 +119,10 @@ SOURCE=.\Allocatable.cpp # End Source File
# Begin Source File
+SOURCE=.\AllocatableObjectCache.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Database.cpp
# End Source File
# Begin Source File
@@ -135,6 +139,10 @@ SOURCE=.\DescriptorParser.cpp # End Source File
# Begin Source File
+SOURCE=.\FileUserAccountMapperI.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\icegridregistry.cpp
# End Source File
# Begin Source File
@@ -215,10 +223,6 @@ SOURCE=.\Util.cpp # End Source File
# Begin Source File
-SOURCE=.\FileUserAccountMapperI.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\WaitQueue.cpp
# End Source File
# End Group
|