diff options
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 85f31a383fc6..9646ba3a6f87 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -322,24 +322,24 @@ SelfTest::SelfTest() { bool bRet = true; - char const * versions[] = {"1.4.0", "1.4.1", "1.0.0", "10.0.0", "10.10.0", + static char const * versions[] = {"1.4.0", "1.4.1", "1.0.0", "10.0.0", "10.10.0", "10.2.2", "10.10.0", "10.10.10", "111.0.999", "1.4.1_01", "9.90.99_09", "1.4.1_99", "1.4.1_00a", "1.4.1-ea", "1.4.1-beta", "1.4.1-rc1", "1.5.0_01-ea", "1.5.0_01-rc2"}; - char const * badVersions[] = {".4.0", "..1", "", "10.0", "10.10.0.", "10.10.0-", "10.10.0.", + static char const * badVersions[] = {".4.0", "..1", "", "10.0", "10.10.0.", "10.10.0-", "10.10.0.", "10.2-2", "10_10.0", "10..10","10.10", "a.0.999", "1.4b.1_01", "9.90.-99_09", "1.4.1_99-", "1.4.1_00a2", "1.4.0_z01z", "1.4.1__99A", "1.4.1-1ea", "1.5.0_010", "1.5.0._01-", "1.5.0_01-eac"}; - char const * orderedVer[] = { "1.3.1-ea", "1.3.1-beta", "1.3.1-rc1", + static char const * orderedVer[] = { "1.3.1-ea", "1.3.1-beta", "1.3.1-rc1", "1.3.1", "1.3.1_00a", "1.3.1_01", "1.3.1_01a", "1.3.2", "1.4.0", "1.5.0_01-ea", "2.0.0"}; - int num = sizeof (versions) / sizeof(char*); - int numBad = sizeof (badVersions) / sizeof(char*); - int numOrdered = sizeof (orderedVer) / sizeof(char*); + int num = SAL_N_ELEMENTS (versions); + int numBad = SAL_N_ELEMENTS (badVersions); + int numOrdered = SAL_N_ELEMENTS (orderedVer); //parsing test (positive) for (int i = 0; i < num; i++) { |