diff options
author | Michael Stahl <mst@openoffice.org> | 2012-07-24 11:43:36 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-07-24 11:46:50 +0200 |
commit | 7dd6a673afa5c8b4bca16c3ae1645269506b4030 (patch) | |
tree | 761e84f9d5b4e15190370a37378184bcfe716560 | |
parent | dd1bc101f93107c021fa180f23bda7ace0c5e6a3 (diff) |
mhu24: add comphelper::newArray_{null,ex} helpers
Change-Id: If44b6e37ecaf721c6ecd9aac0e532ec2be814f50
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
-rw-r--r-- | comphelper/Package_inc.mk | 1 | ||||
-rw-r--r-- | comphelper/inc/comphelper/newarray.hxx | 57 |
2 files changed, 58 insertions, 0 deletions
diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk index 7ed759bc4996..b62f70010533 100644 --- a/comphelper/Package_inc.mk +++ b/comphelper/Package_inc.mk @@ -132,5 +132,6 @@ $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/processfactory.h $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/sequenceashashmap.hxx,comphelper/sequenceashashmap.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/configuration.hxx,comphelper/configuration.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/configurationhelper.hxx,comphelper/configurationhelper.hxx)) +$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/newarray.hxx,comphelper/newarray.hxx)) # vim: set noet sw=4 ts=4: diff --git a/comphelper/inc/comphelper/newarray.hxx b/comphelper/inc/comphelper/newarray.hxx new file mode 100644 index 000000000000..28d2846b98fc --- /dev/null +++ b/comphelper/inc/comphelper/newarray.hxx @@ -0,0 +1,57 @@ +/************************************************************************* + * + * 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. + * + ************************************************************************/ + +#ifndef COMPHELPER_NEW_ARRAY_HXX +#define COMPHELPER_NEW_ARRAY_HXX + +#include <limits> +#include <new> +#include <stddef.h> + +namespace comphelper { + +template<typename T> T * +newArray_null(size_t const n) throw() +{ + if ((::std::numeric_limits<size_t>::max() / sizeof(T)) <= n) { + return 0; + } + return new (::std::nothrow) T[n]; +} + +template<typename T> T * +newArray_ex(size_t const n) +{ + if ((::std::numeric_limits<size_t>::max() / sizeof(T)) <= n) { + throw ::std::bad_alloc(); + } + return new T[n]; +} + +} // namespace comphelper + +#endif // COMPHELPER_NEW_ARRAY_HXX |