summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-12-04 13:24:03 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-12-04 13:24:03 +0000
commit64b64bafa3651a32b96fb6667dbe95b76cb519b7 (patch)
tree9523139736beb61dda6c5aea878c47e097c739af
parent487612a1ed4a37b6e760191a20870462d010c41c (diff)
downloadATCD-64b64bafa3651a32b96fb6667dbe95b76cb519b7.tar.gz
Mon Dec 4 13:23:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp2
3 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d5145de3c29..1dee6605653 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec 4 13:23:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp:
+ * examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp:
+ Added static casts to get rid of warnings with vc
+
Mon Dec 4 12:36:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Oneway_Timeouts/*:
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index 3f8da6650f6..95aa978da82 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -38,7 +38,7 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
ACE_OFF_T real_offset =
ACE_OS::lseek (this->file_io_.get_handle (),
- offset,
+ static_cast <ACE_OFF_T> (offset),
SEEK_SET);
if (real_offset == static_cast<ACE_OFF_T> (-1))
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 1b32514882c..4ca7e00bedb 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -45,7 +45,7 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
ACE_OFF_T real_offset =
ACE_OS::lseek (this->file_io_.get_handle (),
- offset,
+ static_cast<ACE_OFF_T> (offset),
SEEK_SET);
if (real_offset == static_cast<ACE_OFF_T> (-1))