summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-09-11 19:30:25 +0000
committeryamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-09-11 19:30:25 +0000
commitd2dcdec511a7e8f0dc628072c7e6d05dbf590e5e (patch)
tree7616afdd56dc6ffb341c4678fc226ef9235792a1
parent3de879812181299f0351737ac977ef8cff18213e (diff)
downloadATCD-d2dcdec511a7e8f0dc628072c7e6d05dbf590e5e.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog-99c7
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP.h1
3 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index e4ec433bb86..ba98816a9fd 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,10 @@
+Sat Sep 11 14:28:55 1999 Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
+
+ * RTCP.cpp:
+ * orbsvcs/orbsvcs/AV/RTCP.h:
+ Fixed warnings with egcs
+
+
Sat Sep 11 14:13:35 1999 Darrell Brunsch <brunsch@cs.wustl.edu>
* tests/NestedUpcall/Simple/run_test.pl: The wrong argument
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index 73b5f3106e8..d11833a9654 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -567,7 +567,7 @@ double
TAO_AV_RTCP::fmod (double dividend, double divisor)
{
//Method to calculate the fmod (x,y)
- int quotient = dividend / divisor;
+ int quotient = ACE_static_cast (int, (dividend / divisor));
double product = quotient * divisor;
double remainder = dividend - product;
return remainder;
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
index ca42a6d56a9..1ee7aa8b03f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
@@ -186,7 +186,6 @@ public:
static ACE_UINT32 alloc_srcid (ACE_UINT32 addr);
-protected:
static double fmod (double dividend, double divisor);
};