diff options
| author | Mark Spruiell <mes@zeroc.com> | 2004-08-31 21:31:39 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2004-08-31 21:31:39 +0000 |
| commit | f6db0b7e6e4b091d75912eeb71ddd178cd823d80 (patch) | |
| tree | 3dca12bbb7e6c9b71a469353a6192c4ee560d64a /cpp/demo | |
| parent | removing extra semicolon (diff) | |
| download | ice-f6db0b7e6e4b091d75912eeb71ddd178cd823d80.tar.bz2 ice-f6db0b7e6e4b091d75912eeb71ddd178cd823d80.tar.xz ice-f6db0b7e6e4b091d75912eeb71ddd178cd823d80.zip | |
removing global definitions
Diffstat (limited to 'cpp/demo')
| -rw-r--r-- | cpp/demo/Ice/MFC/client/Hello.ice | 7 | ||||
| -rw-r--r-- | cpp/demo/Ice/MFC/client/HelloClientDlg.cpp | 6 | ||||
| -rw-r--r-- | cpp/demo/Ice/MFC/client/HelloClientDlg.h | 4 | ||||
| -rw-r--r-- | cpp/demo/Ice/MFC/server/Hello.ice | 7 | ||||
| -rw-r--r-- | cpp/demo/Ice/MFC/server/HelloI.h | 2 |
5 files changed, 18 insertions, 8 deletions
diff --git a/cpp/demo/Ice/MFC/client/Hello.ice b/cpp/demo/Ice/MFC/client/Hello.ice index 10a98cc1ad3..4ce83cbc4c1 100644 --- a/cpp/demo/Ice/MFC/client/Hello.ice +++ b/cpp/demo/Ice/MFC/client/Hello.ice @@ -10,10 +10,15 @@ #ifndef HELLO_ICE #define HELLO_ICE -class Hello +module Demo +{ + +interface Hello { nonmutating void sayHello(); idempotent void shutdown(); }; +}; + #endif diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp index 3ace6def467..c1b4ff6ac5d 100644 --- a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp +++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp @@ -66,7 +66,7 @@ CHelloClientDlg::OnInitDialog() //
//Ice::ObjectPrx obj = _communicator->stringToProxy("hello:tcp -p 10000:udp -p 10000:ssl -p 10001");
Ice::ObjectPrx obj = _communicator->stringToProxy("hello:tcp -p 10000:udp -p 10000");
- _proxy = HelloPrx::uncheckedCast(obj);
+ _proxy = Demo::HelloPrx::uncheckedCast(obj);
_currentProxy = _proxy;
_status->SetWindowText(CString(" Ready"));
@@ -214,11 +214,11 @@ CHelloClientDlg::updateProxy() if(proxy->ice_isTwoway())
{
- _currentProxy = HelloPrx::checkedCast(proxy);
+ _currentProxy = Demo::HelloPrx::checkedCast(proxy);
}
else
{
- _currentProxy = HelloPrx::uncheckedCast(proxy);
+ _currentProxy = Demo::HelloPrx::uncheckedCast(proxy);
}
_currentMode = mode;
_useSecure = secure;
diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.h b/cpp/demo/Ice/MFC/client/HelloClientDlg.h index 79da6aabdd0..d04328291d2 100644 --- a/cpp/demo/Ice/MFC/client/HelloClientDlg.h +++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.h @@ -31,8 +31,8 @@ protected: CButton* _secure;
CButton* _timeout;
CStatic* _status;
- HelloPrx _proxy;
- HelloPrx _currentProxy;
+ Demo::HelloPrx _proxy;
+ Demo::HelloPrx _currentProxy;
int _currentMode;
bool _useSecure;
bool _useTimeout;
diff --git a/cpp/demo/Ice/MFC/server/Hello.ice b/cpp/demo/Ice/MFC/server/Hello.ice index 10a98cc1ad3..4ce83cbc4c1 100644 --- a/cpp/demo/Ice/MFC/server/Hello.ice +++ b/cpp/demo/Ice/MFC/server/Hello.ice @@ -10,10 +10,15 @@ #ifndef HELLO_ICE #define HELLO_ICE -class Hello +module Demo +{ + +interface Hello { nonmutating void sayHello(); idempotent void shutdown(); }; +}; + #endif diff --git a/cpp/demo/Ice/MFC/server/HelloI.h b/cpp/demo/Ice/MFC/server/HelloI.h index 6f577e43121..1e9878beb91 100644 --- a/cpp/demo/Ice/MFC/server/HelloI.h +++ b/cpp/demo/Ice/MFC/server/HelloI.h @@ -15,7 +15,7 @@ class CDialog; -class HelloI : public Hello +class HelloI : public Demo::Hello { public: |