diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/ice.dsw | 25 | ||||
| -rw-r--r-- | cpp/include/Ice/Incoming.h | 3 |
2 files changed, 10 insertions, 18 deletions
diff --git a/cpp/ice.dsw b/cpp/ice.dsw index fd6d28e9758..70a5daf4e92 100644 --- a/cpp/ice.dsw +++ b/cpp/ice.dsw @@ -105,7 +105,7 @@ Package=<4> ############################################################################### -Project: "interfaceC"=.\test\interface\interfaceC.dsp - Package Owner=<4> +Project: "latencyC"=.\demo\latency\latencyC.dsp - Package Owner=<4> Package=<5> {{{ @@ -123,7 +123,7 @@ Package=<4> ############################################################################### -Project: "interfaceCOL"=.\test\interface\interfaceCOL.dsp - Package Owner=<4> +Project: "latencyS"=.\demo\latency\latencyS.dsp - Package Owner=<4> Package=<5> {{{ @@ -141,7 +141,7 @@ Package=<4> ############################################################################### -Project: "interfaceS"=.\test\interface\interfaceS.dsp - Package Owner=<4> +Project: "library"=.\src\library\library.dsp - Package Owner=<4> Package=<5> {{{ @@ -150,16 +150,13 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name compiler - End Project Dependency - Begin Project Dependency - Project_Dep_Name library + Project_Dep_Name cpp End Project Dependency }}} ############################################################################### -Project: "latencyC"=.\demo\latency\latencyC.dsp - Package Owner=<4> +Project: "operationsC"=.\test\operations\operationsC.dsp - Package Owner=<4> Package=<5> {{{ @@ -168,16 +165,13 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name compiler - End Project Dependency - Begin Project Dependency Project_Dep_Name library End Project Dependency }}} ############################################################################### -Project: "latencyS"=.\demo\latency\latencyS.dsp - Package Owner=<4> +Project: "operationsCOL"=.\test\operations\operationsCOL.dsp - Package Owner=<4> Package=<5> {{{ @@ -186,16 +180,13 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name compiler - End Project Dependency - Begin Project Dependency Project_Dep_Name library End Project Dependency }}} ############################################################################### -Project: "library"=.\src\library\library.dsp - Package Owner=<4> +Project: "operationsS"=.\test\operations\operationsS.dsp - Package Owner=<4> Package=<5> {{{ @@ -204,7 +195,7 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name cpp + Project_Dep_Name library End Project Dependency }}} diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h index 8888b2d47a2..0d06926a21a 100644 --- a/cpp/include/Ice/Incoming.h +++ b/cpp/include/Ice/Incoming.h @@ -12,6 +12,7 @@ #define ICE_INCOMING_H #include <Ice/ObjectAdapterF.h> +#include <Ice/InstanceF.h> #include <Ice/Stream.h> namespace __Ice @@ -21,7 +22,7 @@ class ICE_API Incoming : noncopyable { public: - Incoming(const ::Ice::ObjectAdapter_ptr&); + Incoming(const Instance_ptr&, const ::Ice::ObjectAdapter_ptr&); ~Incoming(); void invoke(Stream&); |