summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2012-07-24 11:22:39 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-07-24 11:37:41 +0200
commite5762c8488e233ac7de394d631202d452b1c92a4 (patch)
treefc9bead436034aaf2a2142324c7b3002c4c8d48b /comphelper
parent84052694960b34371e9e82ce3c8fbcdc3d1ab9d8 (diff)
mhu24: add comphelper::newArray_{null,ex} helpers
Change-Id: I5cba60c8a14fc8d0adc0c4c5273aabbdd9830f91
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/Package_inc.mk1
-rw-r--r--comphelper/inc/comphelper/newarray.hxx51
2 files changed, 52 insertions, 0 deletions
diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk
index c9796c5e76a4..195a5c97c4a7 100644
--- a/comphelper/Package_inc.mk
+++ b/comphelper/Package_inc.mk
@@ -123,5 +123,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..d7ce756d2d48
--- /dev/null
+++ b/comphelper/inc/comphelper/newarray.hxx
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */