summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-01 13:20:55 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-01 13:20:55 +0000
commit423409561c4cb620eeddbc2c5a42154adbd1bb6f (patch)
treea8ddefd2968b6e6f50c32fc319a762771848fd39 /jvmfwk
parentad6387ed0a69b85fb6b49beb5c572c1bbf6ced74 (diff)
CWS-TOOLING: integrate CWS cmcfixes56
2009-03-26 14:46:13 +0100 cmc r270080 : #i100517# merge changes of locales32 to match 2009-03-26 14:31:32 +0100 cmc r270079 : #i100517# add some brackets and remove stray ; 2009-03-25 13:30:36 +0100 cmc r270021 : #i100503# make tralay work again 2009-03-25 10:13:35 +0100 cmc r269999 : #i100536# remove last unused method 2009-03-24 15:13:50 +0100 cmc r269955 : #i100517# fix straight-forward warnings 2009-03-24 14:36:37 +0100 cmc r269947 : #i100469# keep ia64 and arm alignments after fork-exec to signal change, but hackaround for arm to keep userlevel qemu-arm working 2009-03-24 14:02:27 +0100 cmc r269943 : #i100223# make stl headers warning free for extra gcc 4.3 warnings 2009-03-24 13:58:15 +0100 cmc r269942 : #i100504# drawinglayer is warning free on ix86 linux 2009-03-24 13:56:15 +0100 cmc r269940 : #i100469# keep ia64 and arm alignments after fork-exec to signal change
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 083739078bf0..f3586af32bb5 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -110,8 +110,7 @@ bool SunVersion::init(const char *szVersion)
! (nPartPos == 0) // prevents: ".4.1", "..1", part must start with digit
&& (
//seperators after maintainance (1.4.1_01, 1.4.1-beta, or1.4.1
- (pCur == pEnd || *pCur == '_' || *pCur == '-')
- && (nPart == 2 )
+ ((pCur == pEnd || *pCur == '_' || *pCur == '-') && (nPart == 2 ))
||
//separators between major-minor and minor-maintainance
(nPart < 2 && *pCur == '.') )