summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-08-16 12:14:34 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-08-16 12:14:34 +0000
commitde1f456bd881476ce75d29fddfdd65150e1057ac (patch)
tree2c4723f3013bcee12392eae7212809c074edb169
parent3d20fdc294fa28fa2f6bfc86258dac66931726db (diff)
downloadATCD-de1f456bd881476ce75d29fddfdd65150e1057ac.tar.gz
Thu Aug 16 12:13:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog22
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader.h4
3 files changed, 25 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6e5d0fe2f66..c0fc701d3be 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,25 @@
+Thu Aug 16 12:13:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * orbsvcs/orbsvcs/IFR_Service_Utils_T.cpp:
+ * orbsvcs/orbsvcs/Trader/Trader.h:
+ Updated for BCB2007 Update 2
+
+Thu Aug 16 11:42:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/Object_Reference_Sequence_Element_T.h:
+ Provide an inout method, this fixes bugzilla 2877. Thanks to Phil
+ Mesnier for reporting this
+
+ * tests/DynAny_Test/test_dynsequence.cpp:
+ Added test code for bugzilla 2877
+
+ * tao/Transport_Cache_Manager.cpp:
+ Improved layout of a debug message
+
+ * tests/Bug_3042_Regression/client.cpp:
+ * tests/Bug_3042_Regression/test.idl:
+ Increased the bound maximum and set the length of the sequence
+
Thu Aug 16 11:34:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Bounded_Object_Reference_Sequence_T.h:
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
index 2f16ab72680..f37b952d24e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
@@ -345,7 +345,7 @@ TAO_Port_Utils<T>::create_entry (const char *id,
return T::_narrow (obj.in ());
}
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x590)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x591)
// Borland gives warnings about argument not used on the construct as used
// for the other compilers. This has been reported to Borland, adding
// a workaround to suppress these warnings so that the real important ones
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index b517d964854..dcfa42dcc45 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -124,7 +124,7 @@ private:
* Class used to remove the circular dependencies between the
* Attribute classes and the Trader class.
*/
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x590)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x591)
// Work around Borland unresolved symbol errors concerning the
// out-of-line virtual destructor. The virtual destructor should
// not be inlined, nor should we have to export TAO_Lockable from the
@@ -132,7 +132,7 @@ private:
class TAO_Trading_Serv_Export TAO_Lockable
#else
class TAO_Lockable
-#endif /* __BORLANDC__ <= 0x590 */
+#endif /* __BORLANDC__ <= 0x591 */
{
public:
virtual ~TAO_Lockable (void);