diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-10-11 14:44:58 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-10-11 14:44:58 -0400 |
| commit | 027e0fe8d3d1a6c4cf2f6ba2e80016c102943ebe (patch) | |
| tree | 5a17059ea764321a0b6e43f1083dcd6c7db363f1 /cpp/src/Ice/ObjectAdapterI.h | |
| parent | ICE-4829 - Certificate failure on W2003 (diff) | |
| download | ice-027e0fe8d3d1a6c4cf2f6ba2e80016c102943ebe.tar.bz2 ice-027e0fe8d3d1a6c4cf2f6ba2e80016c102943ebe.tar.xz ice-027e0fe8d3d1a6c4cf2f6ba2e80016c102943ebe.zip | |
Partial fix for ICE-4869: C++ stream read/write for structs (and structs-as-class)
is now generated as templates.
Removed most slice2cpp --stream uses (but not all)
Also fixed various build failures on Solaris.
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.h')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index db135a44199..a8c3b703712 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -26,8 +26,10 @@ #include <Ice/ConnectorF.h> #include <Ice/LocatorInfoF.h> #include <Ice/ThreadPoolF.h> +#include <Ice/OutgoingAsyncF.h> #include <Ice/Exception.h> #include <Ice/BuiltinSequences.h> +#include <Ice/Proxy.h> #include <list> namespace Ice |