|
Apache OpenOffice (AOO) Bugzilla – Full Text Issue Listing |
| Summary: | remove obsoleted module-internal custom allocator in SAL | ||
|---|---|---|---|
| Product: | General | Reporter: | hdu <hdu> |
| Component: | code | Assignee: | hdu <hdu> |
| Status: | CLOSED FIXED | QA Contact: | |
| Severity: | Normal | ||
| Priority: | P3 | CC: | fanyuzhen, jsc, kschenk, steve.yin.aoo |
| Version: | 4.1.0 | Flags: | jsc:
4.1.1_release_blocker+
|
| Target Milestone: | 4.1.1 | ||
| Hardware: | All | ||
| OS: | All | ||
| Issue Type: | TASK | Latest Confirmation in: | --- |
| Developer Difficulty: | --- | ||
| Issue Depends on: | 122362 | ||
| Issue Blocks: | 124908 | ||
|
Description
hdu@apache.org
2014-05-14 13:53:06 UTC
Since the obsolete allocator also results in tricky build problems (e.g. attachment 82857 [details]) the removal solves these troubles too.
"hdu" committed SVN revision 1594842 into trunk: #i124896# remove obsoleted sal-module-internal custom STL allocator Hi Herbert. I got a build error on Windows which shows: build -- version: 275224 ============= Building module sal ============= Entering /cygdrive/d/Apache/trunk/openoffice/main/sal/inc Entering /cygdrive/d/Apache/trunk/openoffice/main/sal/osl/w32 dmake: Error: -- `../../inc/rtl/allocator.hxx' not found, and can't be made ERROR: error 65280 occurred while making /cygdrive/d/Apache/trunk/openoffice/main/sal/osl/w32 (In reply to Steve Yin from comment #3) > dmake: Error: -- `../../inc/rtl/allocator.hxx' not found, and can't be made This looks like a bad dependency in you build. The file allocator.hxx is not used anymore, so dmake can only know about this header by a former dependency analysis. Please run fgrep allocator.hxx main/sal to confirm this. Then remove sal's output directory or better make a clean build. FWIW issue 124903 mentioned a similar problem with obsoleted dependencies. Have there been any changes to the build system that would impact the dependency analysis? self-reminder: With all AOO internal users of rtl/allocator gone and no known external users of it, there is no more need for allocator.hxx. Since it used to be shipped in the SDK we'll have to note this in the release notes. Or to reintroduce the obsolete file just to ship it with the SDK. Hi Herbert. I tried to make a clean build by your suggestion. And some other build errors occurred.
D:/Apache/openoffice/main/sal/osl/w32/module.cxx(77) : error C2039: 'Allocator' : is not a member of 'rtl'
D:/Apache/openoffice/main/sal/osl/w32/module.cxx(77) : error C2065: 'Allocator' : undeclared identifier
D:/Apache/openoffice/main/sal/osl/w32/module.cxx(77) : error C2275: 'WCHAR' : illegal use of this type as an expression
D:/Apache/BuildTools/MSSDK_v6.1/include\winnt.h(337) : see declaration of 'WCHAR'
D:/Apache/openoffice/main/sal/osl/w32/module.cxx(77) : error C2143: syntax error : missing ';' before '>'
D:/Apache/openoffice/main/sal/osl/w32/module.cxx(77) : error C2143: syntax error : missing ';' before '>'
D:/Apache/openoffice/main/sal/osl/w32/module.cxx(79) : error C2065: 'vec' : undeclared identifier
D:/Apache/openoffice/main/sal/osl/w32/module.cxx(82) : error C2065: 'vec' : undeclared identifier
D:/Apache/openoffice/main/sal/osl/w32/module.cxx(85) : error C2065: 'vec' : undeclared identifier
dmake: Error code 2, while making '../../wntmsci12.pro/obj/module.obj'
ERROR: error 65280 occurred while making /cygdrive/d/Apache/openoffice/main/sal/osl/w32
"hdu" committed SVN revision 1595333 into trunk: #i124896# use default allocator for w32 ShortPathName buffer "steve_y" committed SVN revision 1595419 into trunk: i124896 add including of rtl/alloc.h in path_helper.hxx for win32 Fixed with the commits above. Thanks Steve. grant showstopper flag for AOO 4.1.1 changes are necessary to build the branch on 10.9.x and Xcode 5.1 "jsc" committed SVN revision 1602187 into branches/AOO410: #124896# merge changes from trunk to be able to build on macos 10.9.3 and Xco... It's verified fixed on Windows via build level testing Verified fixed on r1608485, Linux-32. Builds OK. Verified on r1611634, Mac OS 10.7.5 |