summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2015-03-26 08:35:09 -0700
committerJohnny Willemsen <jwillemsen@remedy.nl>2015-03-26 08:35:09 -0700
commit71c70d7944a861c17545ac53e8d6ab5f37b79a12 (patch)
tree0cee53841e02bd757a136cc5ee0deda9ffaa9690
parentb8fb11e4c297f9adfa9090a3ed8f4dcaa0563eb6 (diff)
parent63f5607438ff01b733b771a0145efc74b4b4c0d1 (diff)
downloadATCD-71c70d7944a861c17545ac53e8d6ab5f37b79a12.tar.gz
Merge pull request #49 from jwillemsen/master
Update News file
-rw-r--r--TAO/NEWS3
-rw-r--r--TAO/tao/CORBALOC_Parser.h12
2 files changed, 5 insertions, 10 deletions
diff --git a/TAO/NEWS b/TAO/NEWS
index 1d14c2ccf9b..e8a9419ef78 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -100,8 +100,7 @@ USER VISIBLE CHANGES BETWEEN TAO-2.2.3 and TAO-2.2.4
. Improved recursive typecode handling
-. Ended maintenance and support for Solaris 10 with Sun
- Studio
+. Ended maintenance for Solaris 10 with Sun Studio
USER VISIBLE CHANGES BETWEEN TAO-2.2.2 and TAO-2.2.3
====================================================
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index c674e134d4a..24c075f204e 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -56,8 +56,7 @@ public:
/// Parse the ior-string that is passed.
virtual CORBA::Object_ptr parse_string (const char *ior,
- CORBA::ORB_ptr orb
- );
+ CORBA::ORB_ptr orb);
private:
@@ -67,18 +66,15 @@ private:
* reference which is sent to the application.
*/
CORBA::Object_ptr make_stub_from_mprofile (CORBA::ORB_ptr orb,
- TAO_MProfile &mprofile
- );
+ TAO_MProfile &mprofile);
/// Gets the pointer to the key_string when the protocol used is RIR
CORBA::Object_ptr parse_string_rir_helper (const char *corbaloc_name,
- CORBA::ORB_ptr orb
- );
+ CORBA::ORB_ptr orb);
void make_canonical (const char *ior,
size_t ior_len,
- ACE_CString &canonical_endpoint
- );
+ ACE_CString &canonical_endpoint);
struct parsed_endpoint {
parsed_endpoint ();