diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2001-12-05 15:51:42 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2001-12-05 15:51:42 +0000 |
| commit | 26a6cdcd928aaf19457b37e59a76c09410a693b3 (patch) | |
| tree | 37d9891e4bacbb6c0011379c27197ca0a56b0063 /cpp/src | |
| parent | Rename StringObjectDict to IdentityObjectDict. (diff) | |
| download | ice-26a6cdcd928aaf19457b37e59a76c09410a693b3.tar.bz2 ice-26a6cdcd928aaf19457b37e59a76c09410a693b3.tar.xz ice-26a6cdcd928aaf19457b37e59a76c09410a693b3.zip | |
src/Freeze fix for windows.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/EvictorI.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/Freeze/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/Freeze/dummy.ice | 0 |
3 files changed, 7 insertions, 3 deletions
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp index 38cbeca7995..36ad041a8a6 100644 --- a/cpp/src/Freeze/EvictorI.cpp +++ b/cpp/src/Freeze/EvictorI.cpp @@ -220,8 +220,12 @@ Freeze::EvictorI::locate(const ObjectAdapterPtr& adapter, const Current& current return 0; } - ObjectPtr servant = p->second; - + // + // This should work - but with MSVC for some reason it does not. Re-examine. + // + //ObjectPtr servant = p->second; + ObjectPtr servant = p->second.get_value(); + // // Add the new Servant to the evictor queue. // diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index 36040fb5279..1a64f333e7c 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -31,7 +31,7 @@ SRCS = $(OBJS:.o=.cpp) HDIR = $(includedir)/Freeze SDIR = $(slicedir)/Freeze SLICECMD = $(SLICE2CPP) --include-dir Freeze --dll-export FREEZE_API -I$(slicedir) -SLICE2FREEZECMD = $(SLICE2FREEZE) --include-dir Freeze --dll-export FREEZE_API -I$(slicedir) +SLICE2FREEZECMD = $(SLICE2FREEZE) --include-dir Freeze -I$(slicedir) include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/Freeze/dummy.ice b/cpp/src/Freeze/dummy.ice new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/cpp/src/Freeze/dummy.ice |