summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpp/demo/Freeze/casino/CasinoStore.ice2
-rw-r--r--cpp/demo/Ice/MFC/client/Hello.ice2
-rw-r--r--cpp/demo/Ice/MFC/server/Hello.ice2
-rw-r--r--cpp/demo/Ice/MFC/server/HelloI.cpp2
-rw-r--r--cpp/demo/Ice/MFC/server/HelloI.h2
-rw-r--r--cpp/demo/Ice/converter/Greet.ice2
-rw-r--r--cpp/demo/Ice/converter/GreetI.cpp2
-rw-r--r--cpp/demo/Ice/converter/GreetI.h2
-rw-r--r--cpp/demo/Ice/session/Session.ice4
-rw-r--r--cpp/demo/Ice/session/SessionI.cpp4
-rw-r--r--cpp/demo/Ice/session/SessionI.h2
-rw-r--r--cpp/demo/book/lifecycle/Filesystem.ice9
-rw-r--r--cs/demo/book/lifecycle/Filesystem.ice9
-rw-r--r--java/demo/Database/library/Session.ice2
-rw-r--r--java/demo/Freeze/casino/Casino.ice14
-rw-r--r--java/demo/Freeze/casino/CasinoStore.ice4
-rw-r--r--java/demo/Freeze/library/Library.ice8
-rw-r--r--java/demo/Freeze/phonebook/PhoneBook.ice8
-rw-r--r--py/demo/Ice/converter/Greet.ice2
19 files changed, 50 insertions, 32 deletions
diff --git a/cpp/demo/Freeze/casino/CasinoStore.ice b/cpp/demo/Freeze/casino/CasinoStore.ice
index f240f1a9a2e..5f20fa190b7 100644
--- a/cpp/demo/Freeze/casino/CasinoStore.ice
+++ b/cpp/demo/Freeze/casino/CasinoStore.ice
@@ -28,7 +28,7 @@ module CasinoStore
//
["freeze:write:mandatory"] void win(int count);
};
- ["java:type:{java.util.Vector}:{java.util.Vector}"] sequence<Winner*> WinnerPrxSeq;
+ sequence<Winner*> WinnerPrxSeq;
class PersistentPlayer implements Casino::Player, Winner
diff --git a/cpp/demo/Ice/MFC/client/Hello.ice b/cpp/demo/Ice/MFC/client/Hello.ice
index 6d5ed8419aa..b5c9e4a599e 100644
--- a/cpp/demo/Ice/MFC/client/Hello.ice
+++ b/cpp/demo/Ice/MFC/client/Hello.ice
@@ -15,7 +15,7 @@ module Demo
interface Hello
{
- ["ami", "cpp:const"] idempotent void sayHello(int delay);
+ ["ami"] idempotent void sayHello(int delay);
["ami"] void shutdown();
};
diff --git a/cpp/demo/Ice/MFC/server/Hello.ice b/cpp/demo/Ice/MFC/server/Hello.ice
index 50120520456..bcaed6ad877 100644
--- a/cpp/demo/Ice/MFC/server/Hello.ice
+++ b/cpp/demo/Ice/MFC/server/Hello.ice
@@ -15,7 +15,7 @@ module Demo
interface Hello
{
- ["cpp:const"] idempotent void sayHello(int delay);
+ idempotent void sayHello(int delay);
void shutdown();
};
diff --git a/cpp/demo/Ice/MFC/server/HelloI.cpp b/cpp/demo/Ice/MFC/server/HelloI.cpp
index 54c83b9ff4e..66500ead03a 100644
--- a/cpp/demo/Ice/MFC/server/HelloI.cpp
+++ b/cpp/demo/Ice/MFC/server/HelloI.cpp
@@ -19,7 +19,7 @@ HelloI::HelloI(const LogIPtr& log, CDialog* dialog) :
}
void
-HelloI::sayHello(int delay, const Ice::Current&) const
+HelloI::sayHello(int delay, const Ice::Current&)
{
if(delay != 0)
{
diff --git a/cpp/demo/Ice/MFC/server/HelloI.h b/cpp/demo/Ice/MFC/server/HelloI.h
index 8af2b47c74b..b32daf35f24 100644
--- a/cpp/demo/Ice/MFC/server/HelloI.h
+++ b/cpp/demo/Ice/MFC/server/HelloI.h
@@ -21,7 +21,7 @@ public:
HelloI(const LogIPtr&, CDialog*);
- virtual void sayHello(int, const Ice::Current&) const;
+ virtual void sayHello(int, const Ice::Current&);
virtual void shutdown(const Ice::Current&);
private:
diff --git a/cpp/demo/Ice/converter/Greet.ice b/cpp/demo/Ice/converter/Greet.ice
index 888baa2cbf9..77802a19be8 100644
--- a/cpp/demo/Ice/converter/Greet.ice
+++ b/cpp/demo/Ice/converter/Greet.ice
@@ -15,7 +15,7 @@ module Demo
interface Greet
{
- ["cpp:const"] idempotent string exchangeGreeting(string s);
+ idempotent string exchangeGreeting(string s);
void shutdown();
};
diff --git a/cpp/demo/Ice/converter/GreetI.cpp b/cpp/demo/Ice/converter/GreetI.cpp
index 453416dabc4..13d35ce539d 100644
--- a/cpp/demo/Ice/converter/GreetI.cpp
+++ b/cpp/demo/Ice/converter/GreetI.cpp
@@ -32,7 +32,7 @@ string decodeString(const string& str)
}
string
-GreetI::exchangeGreeting(const std::string& msg, const Ice::Current&) const
+GreetI::exchangeGreeting(const std::string& msg, const Ice::Current&)
{
cout << "Received (UTF-8): \"" << decodeString(msg) << '\"' << endl;
return "Bonne journ\303\251e";
diff --git a/cpp/demo/Ice/converter/GreetI.h b/cpp/demo/Ice/converter/GreetI.h
index 1648853be9c..cbe31c2a373 100644
--- a/cpp/demo/Ice/converter/GreetI.h
+++ b/cpp/demo/Ice/converter/GreetI.h
@@ -16,7 +16,7 @@ class GreetI : public Demo::Greet
{
public:
- virtual std::string exchangeGreeting(const std::string&, const Ice::Current&) const;
+ virtual std::string exchangeGreeting(const std::string&, const Ice::Current&);
virtual void shutdown(const Ice::Current&);
};
diff --git a/cpp/demo/Ice/session/Session.ice b/cpp/demo/Ice/session/Session.ice
index ceb87714846..dc1ca46fb15 100644
--- a/cpp/demo/Ice/session/Session.ice
+++ b/cpp/demo/Ice/session/Session.ice
@@ -15,7 +15,7 @@ module Demo
interface Hello
{
- ["cpp:const"] idempotent void sayHello();
+ idempotent void sayHello();
};
//
@@ -37,7 +37,7 @@ interface Session
//
idempotent void refresh();
- ["cpp:const"] idempotent string getName();
+ idempotent string getName();
//
// Destroy the session explicitly.
diff --git a/cpp/demo/Ice/session/SessionI.cpp b/cpp/demo/Ice/session/SessionI.cpp
index 824a204e504..e8f07122be8 100644
--- a/cpp/demo/Ice/session/SessionI.cpp
+++ b/cpp/demo/Ice/session/SessionI.cpp
@@ -28,7 +28,7 @@ public:
}
void
- sayHello(const Ice::Current&) const
+ sayHello(const Ice::Current&)
{
cout << "Hello object #" << _id << " for session `" << _name << "' says:\n"
<< "Hello " << _name << "!" << endl;
@@ -76,7 +76,7 @@ SessionI::refresh(const Ice::Current& c)
}
string
-SessionI::getName(const Ice::Current&) const
+SessionI::getName(const Ice::Current&)
{
Lock sync(*this);
if(_destroy)
diff --git a/cpp/demo/Ice/session/SessionI.h b/cpp/demo/Ice/session/SessionI.h
index 955013cb08d..d3b404f423f 100644
--- a/cpp/demo/Ice/session/SessionI.h
+++ b/cpp/demo/Ice/session/SessionI.h
@@ -22,7 +22,7 @@ public:
virtual Demo::HelloPrx createHello(const Ice::Current&);
virtual void refresh(const Ice::Current&);
- virtual std::string getName(const Ice::Current&) const;
+ virtual std::string getName(const Ice::Current&);
virtual void destroy(const Ice::Current&);
IceUtil::Time timestamp() const;
diff --git a/cpp/demo/book/lifecycle/Filesystem.ice b/cpp/demo/book/lifecycle/Filesystem.ice
index 195002c8c46..c81a265d6b5 100644
--- a/cpp/demo/book/lifecycle/Filesystem.ice
+++ b/cpp/demo/book/lifecycle/Filesystem.ice
@@ -1,3 +1,12 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
module Filesystem {
exception GenericError
{
diff --git a/cs/demo/book/lifecycle/Filesystem.ice b/cs/demo/book/lifecycle/Filesystem.ice
index 195002c8c46..c81a265d6b5 100644
--- a/cs/demo/book/lifecycle/Filesystem.ice
+++ b/cs/demo/book/lifecycle/Filesystem.ice
@@ -1,3 +1,12 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
module Filesystem {
exception GenericError
{
diff --git a/java/demo/Database/library/Session.ice b/java/demo/Database/library/Session.ice
index 5640227eb05..0303dadf29b 100644
--- a/java/demo/Database/library/Session.ice
+++ b/java/demo/Database/library/Session.ice
@@ -74,7 +74,7 @@ interface SessionFactory
* @return The timeout (in seconds).
*
**/
- ["nonmutating", "cpp:const"] idempotent long getSessionTimeout();
+ ["nonmutating"] idempotent long getSessionTimeout();
};
};
diff --git a/java/demo/Freeze/casino/Casino.ice b/java/demo/Freeze/casino/Casino.ice
index 35982a8d057..ccb9b01de04 100644
--- a/java/demo/Freeze/casino/Casino.ice
+++ b/java/demo/Freeze/casino/Casino.ice
@@ -21,7 +21,7 @@ module Casino
//
// The number of chips held by this player
//
- ["cpp:const"] int getChips();
+ int getChips();
//
// Destroy this player
@@ -43,7 +43,7 @@ module Casino
// The number of chips each player needs to provide to join
// this bet
//
- ["cpp:const"] int getAmount();
+ int getAmount();
//
// Player p attempts to accept this bet
@@ -64,28 +64,28 @@ module Casino
//
// List of all Players
//
- ["cpp:const"] PlayerPrxSeq getPlayers();
+ PlayerPrxSeq getPlayers();
//
// The number of chips sold by this Bank
//
- ["cpp:const"] int getOutstandingChips();
+ int getOutstandingChips();
//
// The number of live bets
//
- ["cpp:const"] int getLiveBetCount();
+ int getLiveBetCount();
//
// The number of chips earned by the Bank
//
- ["cpp:const"] int getEarnings();
+ int getEarnings();
//
// Verify that the total number of chips held by all known players and bets;
// match getOutstandingChips();
//
- ["cpp:const", "freeze:read:required"] bool checkAllChips();
+ ["freeze:read:required"] bool checkAllChips();
//
// Create a new bet with the given amount to join; this bet ends in
diff --git a/java/demo/Freeze/casino/CasinoStore.ice b/java/demo/Freeze/casino/CasinoStore.ice
index f240f1a9a2e..0f96814ad71 100644
--- a/java/demo/Freeze/casino/CasinoStore.ice
+++ b/java/demo/Freeze/casino/CasinoStore.ice
@@ -46,12 +46,12 @@ module CasinoStore
//
// The total number of chips in play, i.e. amount * potentialWinners.size()
//
- ["cpp:const"] int getChipsInPlay();
+ int getChipsInPlay();
//
// Milliseconds since the epoch
//
- ["cpp:const"] long getCloseTime();
+ long getCloseTime();
//
// Decide who wins and self-destroys
diff --git a/java/demo/Freeze/library/Library.ice b/java/demo/Freeze/library/Library.ice
index f01235e7561..6faa6e3f8e9 100644
--- a/java/demo/Freeze/library/Library.ice
+++ b/java/demo/Freeze/library/Library.ice
@@ -81,7 +81,7 @@ class Book
* @return The book description.
*
**/
- ["cpp:const"] idempotent BookDescription getBookDescription();
+ idempotent BookDescription getBookDescription();
/**
*
@@ -117,7 +117,7 @@ class Book
* currently rented.
*
**/
- ["cpp:const"] idempotent string getRenterName()
+ idempotent string getRenterName()
throws BookNotRentedException;
/**
@@ -191,7 +191,7 @@ interface Library
* @throws DatabaseException Raised if there is a problem with the database.
*
**/
- ["cpp:const"] idempotent Book* findByIsbn(string isbn)
+ idempotent Book* findByIsbn(string isbn)
throws DatabaseException;
/**
@@ -206,7 +206,7 @@ interface Library
* @throws DatabaseException Raised if there is a problem with the database.
*
**/
- ["cpp:const"] idempotent BookPrxSeq findByAuthors(string authors)
+ idempotent BookPrxSeq findByAuthors(string authors)
throws DatabaseException;
/**
diff --git a/java/demo/Freeze/phonebook/PhoneBook.ice b/java/demo/Freeze/phonebook/PhoneBook.ice
index 72bab6fd30d..3b1d8cab161 100644
--- a/java/demo/Freeze/phonebook/PhoneBook.ice
+++ b/java/demo/Freeze/phonebook/PhoneBook.ice
@@ -22,13 +22,13 @@ exception DatabaseException
class Contact
{
- ["cpp:const"] idempotent string getName();
+ idempotent string getName();
["freeze:write"] idempotent void setName(string name) throws DatabaseException;
- ["cpp:const"] idempotent string getAddress();
+ idempotent string getAddress();
["freeze:write"] idempotent void setAddress(string address);
- ["cpp:const"] idempotent string getPhone();
+ idempotent string getPhone();
["freeze:write"] idempotent void setPhone(string phone);
["freeze:write"] void destroy() throws DatabaseException;
@@ -43,7 +43,7 @@ sequence<Contact*> Contacts;
interface PhoneBook
{
Contact* createContact() throws DatabaseException;
- ["cpp:const"] idempotent Contacts findContacts(string name) throws DatabaseException;
+ idempotent Contacts findContacts(string name) throws DatabaseException;
void setEvictorSize(int size) throws DatabaseException;
void shutdown();
};
diff --git a/py/demo/Ice/converter/Greet.ice b/py/demo/Ice/converter/Greet.ice
index 888baa2cbf9..77802a19be8 100644
--- a/py/demo/Ice/converter/Greet.ice
+++ b/py/demo/Ice/converter/Greet.ice
@@ -15,7 +15,7 @@ module Demo
interface Greet
{
- ["cpp:const"] idempotent string exchangeGreeting(string s);
+ idempotent string exchangeGreeting(string s);
void shutdown();
};
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:20:26 +0000