diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-03-07 19:01:00 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-03-07 19:01:00 +0000 |
| commit | 7df63336f64c2b37f987687be04a2da11682e86c (patch) | |
| tree | 93ae09320452bf871e6d9f921cf057fd9fce4015 | |
| parent | 26ce6fbb4b42e6ad98fcd98791f31a85890274df (diff) | |
| download | ATCD-7df63336f64c2b37f987687be04a2da11682e86c.tar.gz | |
ChangeLogTag:Fri Mar 7 10:58:32 2003 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 16 | ||||
| -rw-r--r-- | TAO/tests/Codec/client.cpp | 10 | ||||
| -rw-r--r-- | TAO/tests/Codec/test.idl | 2 |
3 files changed, 22 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4b91a9a3691..668492fffb7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,19 @@ +Fri Mar 7 10:58:32 2003 Ossama Othman <ossama@uci.edu> + + * tests/Codec/test.idl (Foo::Bar::C): + + Changed type of this attribute from "long long" to unsigned long + long". It is better supported/emulated by ACE and TAO on + platforms that lack 64 bit integer support (e.g. VxWorks). + + * tests/Codec/client.cpp: + + Updated to take into account the above change. The + "Foo::Bar::C" attribute is now initialized with a value wrapped + by the ACE_UINT64_LITERAL macro to allow for successful builds + on platforms that lack 64 bit integer support. Fixes + compile-time errors on VxWorks builds. + Fri Mar 7 10:43:57 2003 Ossama Othman <ossama@uci.edu> * tao/DynamicInterface/Request.h: diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp index 57f12230f7e..c46dbe5f905 100644 --- a/TAO/tests/Codec/client.cpp +++ b/TAO/tests/Codec/client.cpp @@ -18,13 +18,13 @@ verify_data (Foo::Bar *original, Foo::Bar *extracted) "--------\n" "%d\n" "%d\n" -// "%Ld\n" +// "%Lu\n" "%s\n\n" "Extracted\n" "---------\n" "%d\n" "%d\n" -// "%Ld\n" +// "%Lu\n" "%s\n\n", original->A, original->B, @@ -86,9 +86,9 @@ main (int argc, char *argv[]) // ---------------------------------------------------------- // Test values to be placed in the test structure. - CORBA::Long A = 1010; - CORBA::Long B = -3427; - CORBA::LongLong C = 3427; + const CORBA::Long A = 1010; + const CORBA::Long B = -3427; + const CORBA::ULongLong C = ACE_UINT64_LITERAL (2001); const char D[] = "I'm Batman."; // Create the structure to be encoded. diff --git a/TAO/tests/Codec/test.idl b/TAO/tests/Codec/test.idl index f805f69026e..3611928c93a 100644 --- a/TAO/tests/Codec/test.idl +++ b/TAO/tests/Codec/test.idl @@ -19,7 +19,7 @@ module Foo { long A; long B; - long long C; + unsigned long long C; string D; }; |