summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2008-03-25 15:09:34 +0800
committerMatthew Newhook <matthew@zeroc.com>2008-03-25 15:09:34 +0800
commit706901b4c9f54faa95edb0795eff959e2ea28d4c (patch)
tree3a49c9185ce08a7115d8512b86a33ede067449c0
parentBug 2899 - gac based install is bogus (diff)
downloadice-706901b4c9f54faa95edb0795eff959e2ea28d4c.tar.bz2
ice-706901b4c9f54faa95edb0795eff959e2ea28d4c.tar.xz
ice-706901b4c9f54faa95edb0795eff959e2ea28d4c.zip
bug 1251 - Align IceBox/hello slice files with Ice/hello.
-rw-r--r--cpp/demo/IceBox/hello/Hello.ice2
-rw-r--r--cpp/demo/IceBox/hello/HelloI.cpp2
-rw-r--r--cpp/demo/IceBox/hello/HelloI.h2
-rw-r--r--cs/demo/IceBox/hello/Hello.ice2
-rw-r--r--java/demo/IceBox/hello/Hello.ice2
5 files changed, 5 insertions, 5 deletions
diff --git a/cpp/demo/IceBox/hello/Hello.ice b/cpp/demo/IceBox/hello/Hello.ice
index ac9d5f5283e..871a5123e30 100644
--- a/cpp/demo/IceBox/hello/Hello.ice
+++ b/cpp/demo/IceBox/hello/Hello.ice
@@ -15,7 +15,7 @@ module Demo
interface Hello
{
- void sayHello();
+ ["cpp:const"] idempotent void sayHello();
};
};
diff --git a/cpp/demo/IceBox/hello/HelloI.cpp b/cpp/demo/IceBox/hello/HelloI.cpp
index 80490fcab4c..f105a0e2a15 100644
--- a/cpp/demo/IceBox/hello/HelloI.cpp
+++ b/cpp/demo/IceBox/hello/HelloI.cpp
@@ -13,7 +13,7 @@
using namespace std;
void
-HelloI::sayHello(const Ice::Current&)
+HelloI::sayHello(const Ice::Current&) const
{
cout << "Hello World!" << endl;
}
diff --git a/cpp/demo/IceBox/hello/HelloI.h b/cpp/demo/IceBox/hello/HelloI.h
index a35799745f2..6576b6ce580 100644
--- a/cpp/demo/IceBox/hello/HelloI.h
+++ b/cpp/demo/IceBox/hello/HelloI.h
@@ -20,7 +20,7 @@ class HELLO_API HelloI : public Demo::Hello
{
public:
- virtual void sayHello(const Ice::Current&);
+ virtual void sayHello(const Ice::Current&) const;
};
#endif
diff --git a/cs/demo/IceBox/hello/Hello.ice b/cs/demo/IceBox/hello/Hello.ice
index ac9d5f5283e..871a5123e30 100644
--- a/cs/demo/IceBox/hello/Hello.ice
+++ b/cs/demo/IceBox/hello/Hello.ice
@@ -15,7 +15,7 @@ module Demo
interface Hello
{
- void sayHello();
+ ["cpp:const"] idempotent void sayHello();
};
};
diff --git a/java/demo/IceBox/hello/Hello.ice b/java/demo/IceBox/hello/Hello.ice
index ac9d5f5283e..871a5123e30 100644
--- a/java/demo/IceBox/hello/Hello.ice
+++ b/java/demo/IceBox/hello/Hello.ice
@@ -15,7 +15,7 @@ module Demo
interface Hello
{
- void sayHello();
+ ["cpp:const"] idempotent void sayHello();
};
};