summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpp/CHANGES3
-rw-r--r--cpp/demo/Glacier/session/HelloSession.ice2
-rw-r--r--cpp/demo/Glacier2/callback/Callback.ice4
-rw-r--r--cpp/demo/Ice/callback/Callback.ice4
-rw-r--r--cpp/demo/Ice/hello/Hello.ice2
-rw-r--r--cpp/demo/Ice/latency/Latency.ice2
-rw-r--r--cpp/demo/Ice/nested/Nested.ice2
-rw-r--r--cpp/demo/IceBox/hello/Hello.ice2
-rw-r--r--cpp/demo/IcePack/simple/Hello.ice2
-rw-r--r--cs/CHANGES3
-rw-r--r--cs/demo/Glacier/session/HelloSession.ice2
-rw-r--r--cs/demo/Ice/callback/Callback.ice4
-rw-r--r--cs/demo/Ice/hello/Hello.ice2
-rw-r--r--cs/demo/Ice/latency/Latency.ice2
-rw-r--r--cs/demo/Ice/nested/Nested.ice2
-rw-r--r--java/CHANGES3
-rw-r--r--java/demo/Glacier/session/HelloSession.ice2
-rw-r--r--java/demo/Ice/callback/Callback.ice4
-rw-r--r--java/demo/Ice/hello/Hello.ice2
-rw-r--r--java/demo/Ice/latency/Latency.ice2
-rw-r--r--java/demo/Ice/nested/Nested.ice2
-rw-r--r--java/demo/IceBox/hello/Hello.ice2
-rw-r--r--java/demo/IcePack/simple/Hello.ice2
23 files changed, 33 insertions, 24 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES
index 3115c3af458..4916af36aa4 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -1,6 +1,9 @@
Changes since version 1.5.1
---------------------------
+- Several demos used Slice classes where interface were more
+ appropriate. This has been fixed.
+
- Fixed a bug in the Windows IcePack registry project that would
cause a compilation error if the registry was compiled before the
node.
diff --git a/cpp/demo/Glacier/session/HelloSession.ice b/cpp/demo/Glacier/session/HelloSession.ice
index c1fc78774d3..b4c1723bd94 100644
--- a/cpp/demo/Glacier/session/HelloSession.ice
+++ b/cpp/demo/Glacier/session/HelloSession.ice
@@ -12,7 +12,7 @@
#include <Glacier/Session.ice>
-interface HelloSession implements Glacier::Session
+interface HelloSession extends Glacier::Session
{
void hello();
};
diff --git a/cpp/demo/Glacier2/callback/Callback.ice b/cpp/demo/Glacier2/callback/Callback.ice
index d275d358d91..6138731b5c0 100644
--- a/cpp/demo/Glacier2/callback/Callback.ice
+++ b/cpp/demo/Glacier2/callback/Callback.ice
@@ -10,12 +10,12 @@
#ifndef CALLBACK_ICE
#define CALLBACK_ICE
-class CallbackReceiver
+interface CallbackReceiver
{
void callback();
};
-class Callback
+interface Callback
{
void initiateCallback(CallbackReceiver* proxy);
void shutdown();
diff --git a/cpp/demo/Ice/callback/Callback.ice b/cpp/demo/Ice/callback/Callback.ice
index d275d358d91..6138731b5c0 100644
--- a/cpp/demo/Ice/callback/Callback.ice
+++ b/cpp/demo/Ice/callback/Callback.ice
@@ -10,12 +10,12 @@
#ifndef CALLBACK_ICE
#define CALLBACK_ICE
-class CallbackReceiver
+interface CallbackReceiver
{
void callback();
};
-class Callback
+interface Callback
{
void initiateCallback(CallbackReceiver* proxy);
void shutdown();
diff --git a/cpp/demo/Ice/hello/Hello.ice b/cpp/demo/Ice/hello/Hello.ice
index 10a98cc1ad3..9b532a2e9a8 100644
--- a/cpp/demo/Ice/hello/Hello.ice
+++ b/cpp/demo/Ice/hello/Hello.ice
@@ -10,7 +10,7 @@
#ifndef HELLO_ICE
#define HELLO_ICE
-class Hello
+interface Hello
{
nonmutating void sayHello();
idempotent void shutdown();
diff --git a/cpp/demo/Ice/latency/Latency.ice b/cpp/demo/Ice/latency/Latency.ice
index 04c9673ec48..1343c63878c 100644
--- a/cpp/demo/Ice/latency/Latency.ice
+++ b/cpp/demo/Ice/latency/Latency.ice
@@ -10,7 +10,7 @@
#ifndef LATENCY_ICE
#define LATENCY_ICE
-class Ping
+interface Ping
{
};
diff --git a/cpp/demo/Ice/nested/Nested.ice b/cpp/demo/Ice/nested/Nested.ice
index aaa52fd6780..916d80d0a12 100644
--- a/cpp/demo/Ice/nested/Nested.ice
+++ b/cpp/demo/Ice/nested/Nested.ice
@@ -10,7 +10,7 @@
#ifndef NESTED_ICE
#define NESTED_ICE
-class Nested
+interface Nested
{
void nestedCall(int level, Nested* proxy);
};
diff --git a/cpp/demo/IceBox/hello/Hello.ice b/cpp/demo/IceBox/hello/Hello.ice
index 0ae5c36e63f..f7344f0d112 100644
--- a/cpp/demo/IceBox/hello/Hello.ice
+++ b/cpp/demo/IceBox/hello/Hello.ice
@@ -10,7 +10,7 @@
#ifndef HELLO_ICE
#define HELLO_ICE
-class Hello
+interface Hello
{
void sayHello();
void shutdown();
diff --git a/cpp/demo/IcePack/simple/Hello.ice b/cpp/demo/IcePack/simple/Hello.ice
index 10a98cc1ad3..9b532a2e9a8 100644
--- a/cpp/demo/IcePack/simple/Hello.ice
+++ b/cpp/demo/IcePack/simple/Hello.ice
@@ -10,7 +10,7 @@
#ifndef HELLO_ICE
#define HELLO_ICE
-class Hello
+interface Hello
{
nonmutating void sayHello();
idempotent void shutdown();
diff --git a/cs/CHANGES b/cs/CHANGES
index d1bc89348c0..b3a5d23223c 100644
--- a/cs/CHANGES
+++ b/cs/CHANGES
@@ -1,6 +1,9 @@
Changes since version 1.5.1
---------------------------
+- Several demos used Slice classes where interface were more
+ appropriate. This has been fixed.
+
- Ice.Util.initializeWithProperties() now correctly parses the command
line arguments.
diff --git a/cs/demo/Glacier/session/HelloSession.ice b/cs/demo/Glacier/session/HelloSession.ice
index c1fc78774d3..b4c1723bd94 100644
--- a/cs/demo/Glacier/session/HelloSession.ice
+++ b/cs/demo/Glacier/session/HelloSession.ice
@@ -12,7 +12,7 @@
#include <Glacier/Session.ice>
-interface HelloSession implements Glacier::Session
+interface HelloSession extends Glacier::Session
{
void hello();
};
diff --git a/cs/demo/Ice/callback/Callback.ice b/cs/demo/Ice/callback/Callback.ice
index d275d358d91..6138731b5c0 100644
--- a/cs/demo/Ice/callback/Callback.ice
+++ b/cs/demo/Ice/callback/Callback.ice
@@ -10,12 +10,12 @@
#ifndef CALLBACK_ICE
#define CALLBACK_ICE
-class CallbackReceiver
+interface CallbackReceiver
{
void callback();
};
-class Callback
+interface Callback
{
void initiateCallback(CallbackReceiver* proxy);
void shutdown();
diff --git a/cs/demo/Ice/hello/Hello.ice b/cs/demo/Ice/hello/Hello.ice
index 10a98cc1ad3..9b532a2e9a8 100644
--- a/cs/demo/Ice/hello/Hello.ice
+++ b/cs/demo/Ice/hello/Hello.ice
@@ -10,7 +10,7 @@
#ifndef HELLO_ICE
#define HELLO_ICE
-class Hello
+interface Hello
{
nonmutating void sayHello();
idempotent void shutdown();
diff --git a/cs/demo/Ice/latency/Latency.ice b/cs/demo/Ice/latency/Latency.ice
index 04c9673ec48..1343c63878c 100644
--- a/cs/demo/Ice/latency/Latency.ice
+++ b/cs/demo/Ice/latency/Latency.ice
@@ -10,7 +10,7 @@
#ifndef LATENCY_ICE
#define LATENCY_ICE
-class Ping
+interface Ping
{
};
diff --git a/cs/demo/Ice/nested/Nested.ice b/cs/demo/Ice/nested/Nested.ice
index aaa52fd6780..916d80d0a12 100644
--- a/cs/demo/Ice/nested/Nested.ice
+++ b/cs/demo/Ice/nested/Nested.ice
@@ -10,7 +10,7 @@
#ifndef NESTED_ICE
#define NESTED_ICE
-class Nested
+interface Nested
{
void nestedCall(int level, Nested* proxy);
};
diff --git a/java/CHANGES b/java/CHANGES
index 8ac6f610549..d4170e7322a 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -1,6 +1,9 @@
Changes since version 1.5.1
---------------------------
+- Several demos used Slice classes where interface were more
+ appropriate. This has been fixed.
+
- Ice.Util.initializeWithProperties() now correctly parses the command
line arguments.
diff --git a/java/demo/Glacier/session/HelloSession.ice b/java/demo/Glacier/session/HelloSession.ice
index c1fc78774d3..b4c1723bd94 100644
--- a/java/demo/Glacier/session/HelloSession.ice
+++ b/java/demo/Glacier/session/HelloSession.ice
@@ -12,7 +12,7 @@
#include <Glacier/Session.ice>
-interface HelloSession implements Glacier::Session
+interface HelloSession extends Glacier::Session
{
void hello();
};
diff --git a/java/demo/Ice/callback/Callback.ice b/java/demo/Ice/callback/Callback.ice
index d275d358d91..6138731b5c0 100644
--- a/java/demo/Ice/callback/Callback.ice
+++ b/java/demo/Ice/callback/Callback.ice
@@ -10,12 +10,12 @@
#ifndef CALLBACK_ICE
#define CALLBACK_ICE
-class CallbackReceiver
+interface CallbackReceiver
{
void callback();
};
-class Callback
+interface Callback
{
void initiateCallback(CallbackReceiver* proxy);
void shutdown();
diff --git a/java/demo/Ice/hello/Hello.ice b/java/demo/Ice/hello/Hello.ice
index 10a98cc1ad3..9b532a2e9a8 100644
--- a/java/demo/Ice/hello/Hello.ice
+++ b/java/demo/Ice/hello/Hello.ice
@@ -10,7 +10,7 @@
#ifndef HELLO_ICE
#define HELLO_ICE
-class Hello
+interface Hello
{
nonmutating void sayHello();
idempotent void shutdown();
diff --git a/java/demo/Ice/latency/Latency.ice b/java/demo/Ice/latency/Latency.ice
index 04c9673ec48..1343c63878c 100644
--- a/java/demo/Ice/latency/Latency.ice
+++ b/java/demo/Ice/latency/Latency.ice
@@ -10,7 +10,7 @@
#ifndef LATENCY_ICE
#define LATENCY_ICE
-class Ping
+interface Ping
{
};
diff --git a/java/demo/Ice/nested/Nested.ice b/java/demo/Ice/nested/Nested.ice
index aaa52fd6780..916d80d0a12 100644
--- a/java/demo/Ice/nested/Nested.ice
+++ b/java/demo/Ice/nested/Nested.ice
@@ -10,7 +10,7 @@
#ifndef NESTED_ICE
#define NESTED_ICE
-class Nested
+interface Nested
{
void nestedCall(int level, Nested* proxy);
};
diff --git a/java/demo/IceBox/hello/Hello.ice b/java/demo/IceBox/hello/Hello.ice
index 0ae5c36e63f..f7344f0d112 100644
--- a/java/demo/IceBox/hello/Hello.ice
+++ b/java/demo/IceBox/hello/Hello.ice
@@ -10,7 +10,7 @@
#ifndef HELLO_ICE
#define HELLO_ICE
-class Hello
+interface Hello
{
void sayHello();
void shutdown();
diff --git a/java/demo/IcePack/simple/Hello.ice b/java/demo/IcePack/simple/Hello.ice
index 10a98cc1ad3..9b532a2e9a8 100644
--- a/java/demo/IcePack/simple/Hello.ice
+++ b/java/demo/IcePack/simple/Hello.ice
@@ -10,7 +10,7 @@
#ifndef HELLO_ICE
#define HELLO_ICE
-class Hello
+interface Hello
{
nonmutating void sayHello();
idempotent void shutdown();
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-06 02:55:24 +0000