summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLog11
-rw-r--r--TAO/tao/Valuetype/AbstractBase.h3
-rw-r--r--TAO/tao/Valuetype/AbstractBase.inl3
-rw-r--r--TAO/tao/Valuetype/AbstractBase_T.cpp20
-rw-r--r--TAO/tao/Valuetype/AbstractBase_T.h6
-rw-r--r--TAO/tao/Valuetype/ValueFactory.h7
-rw-r--r--TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp10
-rw-r--r--TAO/tao/Valuetype/Valuetype_Adapter_Impl.h3
8 files changed, 27 insertions, 36 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 34e676917e7..1cbb4823874 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Mon Aug 30 10:00:45 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/Valuetype/AbstractBase.h:
+ * tao/Valuetype/AbstractBase.inl:
+ * tao/Valuetype/AbstractBase_T.h:
+ * tao/Valuetype/AbstractBase_T.cpp:
+ * tao/Valuetype/ValueFactory.h:
+ * tao/Valuetype/Valuetype_Adapter_Impl.h:
+ * tao/Valuetype/Valuetype_Adapter_Impl.cpp:
+ Layout and const changes
+
Mon Aug 30 07:44:17 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Connection_Handler.cpp:
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index 9dabff20d5e..94a2eecb49e 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -84,8 +84,7 @@ namespace CORBA
CORBA::Object_ptr _to_object (void);
CORBA::ValueBase *_to_value (void);
- virtual CORBA::Boolean _is_a (const char *type_id
- );
+ virtual CORBA::Boolean _is_a (const char *type_id);
virtual const char* _interface_repository_id (void) const;
/// TAO specific operations
diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl
index fd1a25ee008..3236ecfeaa2 100644
--- a/TAO/tao/Valuetype/AbstractBase.inl
+++ b/TAO/tao/Valuetype/AbstractBase.inl
@@ -14,8 +14,7 @@ CORBA::AbstractBase::_nil (void)
}
ACE_INLINE CORBA::AbstractBase_ptr
-CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj
- )
+CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj)
{
return CORBA::AbstractBase::_duplicate (obj);
}
diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp
index 42acdb56e79..b3fab612845 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.cpp
+++ b/TAO/tao/Valuetype/AbstractBase_T.cpp
@@ -15,8 +15,7 @@ namespace TAO
AbstractBase_Narrow_Utils<T>::narrow (
CORBA::AbstractBase_ptr obj,
const char *repo_id,
- Proxy_Broker_Factory pbf
- )
+ Proxy_Broker_Factory pbf)
{
if (CORBA::is_nil (obj))
{
@@ -35,10 +34,7 @@ namespace TAO
}
return
- AbstractBase_Narrow_Utils<T>::unchecked_narrow (obj,
- repo_id,
- pbf
- );
+ AbstractBase_Narrow_Utils<T>::unchecked_narrow (obj, repo_id, pbf);
}
template<typename T> T *
@@ -48,21 +44,14 @@ namespace TAO
{
T *proxy = 0;
-
try
{
proxy =
- AbstractBase_Narrow_Utils<T>::unchecked_narrow (
- obj,
- 0,
- pbf
- );
+ AbstractBase_Narrow_Utils<T>::unchecked_narrow (obj, 0, pbf);
}
catch (const ::CORBA::Exception&)
{
- // Consume and return proxy
- return proxy;
}
return proxy;
@@ -72,8 +61,7 @@ namespace TAO
AbstractBase_Narrow_Utils<T>::unchecked_narrow (
CORBA::AbstractBase_ptr obj,
const char *,
- Proxy_Broker_Factory pbf
- )
+ Proxy_Broker_Factory pbf)
{
if (CORBA::is_nil (obj))
{
diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h
index 79c85ae0d87..3d088a6645b 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.h
+++ b/TAO/tao/Valuetype/AbstractBase_T.h
@@ -38,16 +38,14 @@ namespace TAO
static T_ptr narrow (CORBA::AbstractBase_ptr,
const char *repo_id,
- Proxy_Broker_Factory
- );
+ Proxy_Broker_Factory);
static T_ptr unchecked_narrow (CORBA::AbstractBase_ptr,
Proxy_Broker_Factory);
static T_ptr unchecked_narrow (CORBA::AbstractBase_ptr,
const char *repo_id,
- Proxy_Broker_Factory
- );
+ Proxy_Broker_Factory);
};
}
diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h
index 859a011e331..8a395d2aaf2 100644
--- a/TAO/tao/Valuetype/ValueFactory.h
+++ b/TAO/tao/Valuetype/ValueFactory.h
@@ -62,11 +62,10 @@ namespace CORBA
// private: %!
/// In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T)
/// (see at definition below)
- virtual CORBA::ValueBase * create_for_unmarshal (
- void) = 0;
+ virtual CORBA::ValueBase * create_for_unmarshal (void) = 0;
- // Not pure virtual because this will be overridden only by valuetypes
- // that support an abstract interface.
+ /// Not pure virtual because this will be overridden only by valuetypes
+ /// that support an abstract interface.
virtual CORBA::AbstractBase_ptr create_for_unmarshal_abstract (void);
private:
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
index 0045d067663..74002deaf23 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
@@ -17,8 +17,7 @@ TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void)
CORBA::Object_ptr
TAO_Valuetype_Adapter_Impl::abstractbase_to_object (
- CORBA::AbstractBase_ptr p
- )
+ CORBA::AbstractBase_ptr p)
{
return p->_to_object ();
}
@@ -33,8 +32,7 @@ TAO_Valuetype_Adapter_Impl::stream_to_value (TAO_InputCDR &cdr,
CORBA::Boolean
TAO_Valuetype_Adapter_Impl::stream_to_abstract_base (
TAO_InputCDR &cdr,
- CORBA::AbstractBase_ptr & obj
- )
+ CORBA::AbstractBase_ptr & obj)
{
return cdr >> obj;
}
@@ -82,8 +80,8 @@ TAO_Valuetype_Adapter_Impl::vf_map_unbind (const char *repo_id)
{
CORBA::ValueFactory factory = 0;
- int result = map_.unbind (repo_id, factory);
- if (! result)
+ int const result = map_.unbind (repo_id, factory);
+ if (!result)
{
factory->_remove_ref ();
}
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
index abf4b8a6313..d9f83443214 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
@@ -47,8 +47,7 @@ public:
virtual CORBA::Object_ptr abstractbase_to_object (
CORBA::AbstractBase_ptr);
- virtual CORBA::Boolean stream_to_value (TAO_InputCDR &,
- CORBA::ValueBase *&);
+ virtual CORBA::Boolean stream_to_value (TAO_InputCDR &, CORBA::ValueBase *&);
virtual CORBA::Boolean stream_to_abstract_base (
TAO_InputCDR &,
View Lorry Controller Status