aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-07-11 17:13:37 +0200
committerBruce Yinhe <[email protected]>2014-07-11 17:13:37 +0200
commita6c14b840171f34acb1df85c800df451610988f3 (patch)
tree6fbf2ecfd4559193825add9c94b6badba03ece44
parent9b40085e02d90c46f7a6ef644fba66432bd8190a (diff)
parent386e8c157fce5d0b9f61a1e8ea03e20b6e875619 (diff)
downloadotp-a6c14b840171f34acb1df85c800df451610988f3.tar.gz
otp-a6c14b840171f34acb1df85c800df451610988f3.tar.bz2
otp-a6c14b840171f34acb1df85c800df451610988f3.zip
Merge branch 'maint'
-rw-r--r--lib/orber/src/orber_iiop.hrl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/orber/src/orber_iiop.hrl b/lib/orber/src/orber_iiop.hrl
index 7a30af63e4..b2e970b30d 100644
--- a/lib/orber/src/orber_iiop.hrl
+++ b/lib/orber/src/orber_iiop.hrl
@@ -467,14 +467,14 @@
[{"iiop_version",?IIOP_VERSION },
{"host", {'tk_string', 0}},
{"port", 'tk_ushort'},
- {"object_key", {'tk_sequence', 'tk_octet', 0}}
+ {"object_key", {'tk_sequence', 'tk_octet', 0}},
{"components", ?IOP_TAGGEDCOMPONENT_SEQ}]}).
-define(PROFILEBODY_1_2_TYPEDEF, {'tk_struct', ?SYSTEM_TYPE, 'IIOP_ProfileBody_1_1',
[{"iiop_version",?IIOP_VERSION },
{"host", {'tk_string', 0}},
{"port", 'tk_ushort'},
- {"object_key", {'tk_sequence', 'tk_octet', 0}}
+ {"object_key", {'tk_sequence', 'tk_octet', 0}},
{"components", ?IOP_TAGGEDCOMPONENT_SEQ}]}).
-define(SSLIOP_SSL, {'tk_struct', ?SYSTEM_TYPE, 'SSLIOP_SSL',