diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-30 18:25:13 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-30 18:25:13 +0000 |
| commit | 563d5a92d524e1e519b7b60ada77f06437e1915f (patch) | |
| tree | e34b9819f073ba2615d0c9c651f46ae197fed239 | |
| parent | 5f9c85ac0b1a925f7d4163228ae3c2bcb2fc9ea4 (diff) | |
| download | ATCD-563d5a92d524e1e519b7b60ada77f06437e1915f.tar.gz | |
Tue Sep 30 18:24:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 59d47ace19f..77e4178f179 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Sep 30 18:24:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp + * orbsvcs/tests/Bug_2925_Regression/client.cpp + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp + ACE_TCHAR fixes + Tue Sep 30 18:03:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp index 5884640a350..68a0060db72 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp @@ -10,7 +10,7 @@ #include "ORB_Initializer.h" #include "tao/ORBInitializer_Registry.h" -const char *ior_file = 0; +const ACE_TCHAR *ior_file = 0; int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp index 3cead715763..22f428a8c99 100644 --- a/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp @@ -64,7 +64,7 @@ static int const dscp[] = IPDSFIELD_DSCP_EF }; -const char *ior_file = 0; +const ACE_TCHAR *ior_file = 0; void test_sleep (int microsec) diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index 80882cde765..787ccb9e80f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -18,7 +18,7 @@ ACE_RCSID (ForwardRequest, server, "$Id$") -const char *ior_file = 0; +const ACE_TCHAR *ior_file = 0; int parse_args (int argc, ACE_TCHAR *argv[]) |