summaryrefslogtreecommitdiff
path: root/idlc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-30 16:24:17 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-30 16:33:30 +0100
commit299036996af6ae8897b1f2e07bbab7074955dfe8 (patch)
tree6e268c65269a36c0d74bceb214782672b3ded214 /idlc
parent81b959dd976d4caf8a5be9ef7e9cc343ab2f6289 (diff)
[oneway] removal cleanup
Change-Id: I1d60bb4042753bd18475166054ad57dceb2fc97d
Diffstat (limited to 'idlc')
-rw-r--r--idlc/inc/idlc/astoperation.hxx2
-rw-r--r--idlc/inc/idlc/errorhandler.hxx3
-rw-r--r--idlc/source/errorhandler.cxx6
-rw-r--r--idlc/test/interface.idl1
4 files changed, 0 insertions, 12 deletions
diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/idlc/astoperation.hxx
index 304113c9a495..90ea5c9c918a 100644
--- a/idlc/inc/idlc/astoperation.hxx
+++ b/idlc/inc/idlc/astoperation.hxx
@@ -24,8 +24,6 @@
namespace typereg { class Writer; }
-#define OP_NONE 0x0000
-
class AstType;
class AstOperation : public AstDeclaration
diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/idlc/errorhandler.hxx
index 978003fe7667..0853bb1545f9 100644
--- a/idlc/inc/idlc/errorhandler.hxx
+++ b/idlc/inc/idlc/errorhandler.hxx
@@ -36,7 +36,6 @@ enum ErrorCode
EIDL_MULTIPLE_BRANCH, // More than one union branch with this label
EIDL_COERCION_FAILURE, // Coercion failure
EIDL_SCOPE_CONFLICT, // Between fwd declare and full declare
- EIDL_ONEWAY_CONFLICT, // Between op decl and argument direction
EIDL_DISC_TYPE, // Illegal discriminator type in union
EIDL_LABEL_TYPE, // Mismatch with discriminator type in union
EIDL_ILLEGAL_ADD, // Illegal add action
@@ -54,13 +53,11 @@ enum ErrorCode
EIDL_DECL_NOT_DEFINED, // Forward declared but never defined
EIDL_FWD_DECL_LOOKUP, // Tried to lookup in fwd declared intf
EIDL_RECURSIVE_TYPE, // Illegal recursive use of type
- EIDL_NONVOID_ONEWAY, // Non-void return type in oneway operation
EIDL_NOT_A_TYPE, // Not a type
EIDL_TYPE_NOT_VALID, // Type is not valid in this context
EIDL_INTERFACEMEMBER_LOOKUP, // interface is not defined or a fwd declaration not exists
EIDL_SERVICEMEMBER_LOOKUP,
EIDL_TYPE_IDENT_CONFLICT, // type and identifier has equal names
- EIDL_ONEWAY_RAISE_CONFLICT, // oneway function raised excpetion conflict
EIDL_WRONGATTRIBUTEFLAG,
EIDL_DEFINED_ATTRIBUTEFLAG,
EIDL_WRONGATTRIBUTEKEYWORD,
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx
index 2b91d4dac28a..447e8c3675e8 100644
--- a/idlc/source/errorhandler.cxx
+++ b/idlc/source/errorhandler.cxx
@@ -42,8 +42,6 @@ static const sal_Char* errorCodeToMessage(ErrorCode eCode)
return "coercion failure ";
case EIDL_SCOPE_CONFLICT:
return "definition scope is different than fwd declare scope, ";
- case EIDL_ONEWAY_CONFLICT:
- return "oneway operation with OUT|INOUT parameters or raises exceptions, ";
case EIDL_DISC_TYPE:
return "union with illegal discriminator type, ";
case EIDL_LABEL_TYPE:
@@ -78,8 +76,6 @@ static const sal_Char* errorCodeToMessage(ErrorCode eCode)
return "";
case EIDL_RECURSIVE_TYPE:
return "illegal recursive use of type: ";
- case EIDL_NONVOID_ONEWAY:
- return "non-void return type in oneway operation: ";
case EIDL_NOT_A_TYPE:
return "specified symbol is not a type: ";
case EIDL_TYPE_NOT_VALID:
@@ -90,8 +86,6 @@ static const sal_Char* errorCodeToMessage(ErrorCode eCode)
return "error in lookup of symbol, expected service is not defined: ";
case EIDL_TYPE_IDENT_CONFLICT:
return "type and parameter/member name are equal: ";
- case EIDL_ONEWAY_RAISE_CONFLICT:
- return "oneway operation cannot raises exceptions: ";
case EIDL_WRONGATTRIBUTEFLAG:
return "the used flag is not valid in this context: ";
case EIDL_DEFINED_ATTRIBUTEFLAG:
diff --git a/idlc/test/interface.idl b/idlc/test/interface.idl
index 7af48c8b60d7..8787c4d50e62 100644
--- a/idlc/test/interface.idl
+++ b/idlc/test/interface.idl
@@ -35,7 +35,6 @@ interface XBase
interface XTestBaseTypes : XBase
{
void voidFunc();
- void onewayFunc();
short shortFunc( [in] short inparam, [out] short outparam, [inout] short inoutparam);
unsigned short uShortFunc( [in] unsigned short inparam, [out] unsigned short outparam, [inout] unsigned short inoutparam);