summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-20 11:02:26 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-20 11:02:26 +0000
commit13c1aaa46f980b63b4da5bb438ee248dd23f2d3a (patch)
tree415de240a912898761de2a661c014a41ebc98a90
parent47315d0850734c38477cad4b0564fff1c40fa905 (diff)
downloadATCD-13c1aaa46f980b63b4da5bb438ee248dd23f2d3a.tar.gz
Mon Sep 20 07:00:15 2004 Carlos O'Ryan <coryan@atdesk.com>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp2
-rw-r--r--TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp2
3 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 618bbba6011..420c1969e81 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Mon Sep 20 07:00:15 2004 Carlos O'Ryan <coryan@atdesk.com>
+
+ * tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp:
+ * tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp:
+ Use the argc/argv prototype for main, apparently the ACE
+ renaming of main() does not work for the other standard
+ prototype for main().
+
Sun Sep 19 14:19:06 2004 Carlos O'Ryan <coryan@atdesk.com>
* tests/Sequence_Unit_Tests/README:
diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
index 38a660fd2a3..0365a9b57c3 100644
--- a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
@@ -18,7 +18,7 @@ struct Foo
CORBA::ULong const TEST_INT_MAX = 32;
CORBA::ULong const TEST_FOO_MAX = 64;
-int main()
+int main(int,char*[])
{
typedef TAO::bounded_sequence<int,TEST_INT_MAX> int_sequence;
diff --git a/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
index b3de52b7269..37f0d22a306 100644
--- a/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
@@ -15,7 +15,7 @@ struct Foo
int x;
};
-int main()
+int main(int,char*[])
{
typedef TAO::unbounded_sequence<int> int_sequence;