diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-11-24 09:51:32 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-24 15:29:52 +0000 |
commit | 89f057a09d8684f697a822662907cfede7ef0a3f (patch) | |
tree | 86ee58acdc9bc88a8d92826ec8582b046a910653 /sal/rtl | |
parent | 56d168cc59a352ec432e09b8ba471b858387023c (diff) |
ditch dbg_dump
Diffstat (limited to 'sal/rtl')
-rw-r--r-- | sal/rtl/source/debugprint.cxx | 67 | ||||
-rw-r--r-- | sal/rtl/source/makefile.mk | 33 |
2 files changed, 0 insertions, 100 deletions
diff --git a/sal/rtl/source/debugprint.cxx b/sal/rtl/source/debugprint.cxx deleted file mode 100644 index 079643b07fd4..000000000000 --- a/sal/rtl/source/debugprint.cxx +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sal.hxx" - -#include <rtl/string.hxx> -#include <rtl/strbuf.hxx> -#include <rtl/ustring.hxx> -#include <rtl/ustrbuf.hxx> - -const sal_Char *dbg_dump(const rtl::OString &rStr) -{ - return rStr.getStr(); -} - -const sal_Char *dbg_dump(const rtl::OStringBuffer &rStrBuf) -{ - return rStrBuf.getStr(); -} - -const sal_Char *dbg_dump(rtl_String *pStr) -{ - return rtl_string_getStr(pStr); -} - -const sal_Char *dbg_dump(const rtl::OUString &rStr) -{ - return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8)); -} - -const sal_Char *dbg_dump(const rtl::OUStringBuffer &rStrBuf) -{ - return dbg_dump(rtl::OUString(rStrBuf.getStr())); -} - -const sal_Char *dbg_dump(rtl_uString *pStr) -{ - return dbg_dump(rtl::OUString(pStr)); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk index ff8ee9142e5b..60953f84b919 100644 --- a/sal/rtl/source/makefile.mk +++ b/sal/rtl/source/makefile.mk @@ -58,14 +58,6 @@ CXXFLAGS+= $(LFS_CFLAGS) .IF "$(header)" == "" -.IF "$(OS)" != "AIX" -ALWAYSDBGFILES=$(SLO)$/debugprint.obj -.ENDIF - -.IF "$(ALWAYSDBGFILES)" != "" -ALWAYSDBGTARGET=do_it_alwaysdebug -.ENDIF - SLOFILES= \ $(SLO)$/memory.obj \ $(SLO)$/cipher.obj \ @@ -87,7 +79,6 @@ SLOFILES= \ $(SLO)$/cmdargs.obj \ $(SLO)$/unload.obj \ $(SLO)$/logfile.obj \ - $(SLO)$/debugprint.obj \ $(SLO)$/math.obj \ $(SLO)$/alloc_global.obj\ $(SLO)$/alloc_cache.obj \ @@ -121,7 +112,6 @@ OBJFILES= \ $(OBJ)$/alloc_arena.obj \ $(OBJ)$/alloc_fini.obj - .ENDIF # --- Makefile snippet -------------------------------------------- @@ -131,31 +121,8 @@ BOOTSTRAPMK = $(OUT)$/inc$/rtlbootstrap.mk # --- Targets ------------------------------------------------------ -.IF "$(ALWAYSDBG_FLAG)"=="" -TARGETDEPS+=$(ALWAYSDBGTARGET) -.ENDIF - .INCLUDE : target.mk -.IF "$(ALWAYSDBGTARGET)" != "" -.IF "$(ALWAYSDBG_FLAG)" == "" -# -------------------------------------------------- -# - ALWAYSDBG - files always compiled with debugging -# -------------------------------------------------- -$(ALWAYSDBGTARGET): - @echo --- ALWAYSDBGFILES --- - @dmake $(MFLAGS) $(MAKEFILE) debug=true $(ALWAYSDBGFILES) ALWAYSDBG_FLAG=TRUE $(CALLMACROS) - @echo --- ALWAYSDBGFILES OVER --- - -$(ALWAYSDBGFILES): - @echo --- ALWAYSDBG --- - @dmake $(MFLAGS) $(MAKEFILE) debug=true ALWAYSDBG_FLAG=TRUE $(CALLMACROS) $@ - @echo --- ALWAYSDBG OVER --- - -.ENDIF -.ENDIF - - ALLTAR : $(BOOTSTRAPMK) $(BOOTSTRAPMK) : |