summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-12 12:27:52 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-12 12:27:52 +0000
commitd5b0b9a0fda0830f06d9a63a1f93302a61a82950 (patch)
treee1a969011e0f2c157d77daf0ce3aa282b5633918
parent8867df5c01eadebb6bad6dc6919972cb4aa865d1 (diff)
downloadATCD-d5b0b9a0fda0830f06d9a63a1f93302a61a82950.tar.gz
ChangeLogTag: Wed Jul 12 07:26:25 2000 David L. Levine <levine@cs.wustl.edu>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--tests/Service_Config_Test.cpp3
4 files changed, 20 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a1ff648d103..cee3f78d279 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul 12 07:26:25 2000 David L. Levine <levine@cs.wustl.edu>
+
+ * tests/Service_Config_Test.cpp (instance): cast the u_short to
+ u_long before casting to void *, to avoid KCC warning about
+ casting to pointer from integer of different size.
+
Tue Jul 11 17:20:48 2000 David L. Levine <levine@cs.wustl.edu>
* ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): try a reinterpret cast
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a1ff648d103..cee3f78d279 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Wed Jul 12 07:26:25 2000 David L. Levine <levine@cs.wustl.edu>
+
+ * tests/Service_Config_Test.cpp (instance): cast the u_short to
+ u_long before casting to void *, to avoid KCC warning about
+ casting to pointer from integer of different size.
+
Tue Jul 11 17:20:48 2000 David L. Levine <levine@cs.wustl.edu>
* ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): try a reinterpret cast
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a1ff648d103..cee3f78d279 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Wed Jul 12 07:26:25 2000 David L. Levine <levine@cs.wustl.edu>
+
+ * tests/Service_Config_Test.cpp (instance): cast the u_short to
+ u_long before casting to void *, to avoid KCC warning about
+ casting to pointer from integer of different size.
+
Tue Jul 11 17:20:48 2000 David L. Levine <levine@cs.wustl.edu>
* ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): try a reinterpret cast
diff --git a/tests/Service_Config_Test.cpp b/tests/Service_Config_Test.cpp
index dfb72483a29..7650417c110 100644
--- a/tests/Service_Config_Test.cpp
+++ b/tests/Service_Config_Test.cpp
@@ -76,7 +76,8 @@ Test_Singleton::instance (u_short variety)
ACE_Object_Manager::at_exit (instances[variety],
test_singleton_cleanup,
- (void *) variety);
+ ACE_reinterpret_cast (void *,
+ ACE_static_cast (u_long, variety)));
return instances[variety];
}