diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-06-01 17:19:49 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-06-01 17:19:49 +0200 |
commit | 5d78d488fd16fc7403c68cb42330e561ea30046c (patch) | |
tree | 2235867c52f3f9969a3f17b3da6c5ac8a0456930 /include | |
parent | bb8040595c9b6f0ccde39e6833f27a50abb891d8 (diff) |
Can use boost::make_optional
...reportedly available since Boost 1.34, and configure.ac checks for at least
Boost 1.47.
Change-Id: I07952de220f1eee5f91ad83a1965420eb6b09ada
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/optional.hxx | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/include/comphelper/optional.hxx b/include/comphelper/optional.hxx deleted file mode 100644 index 42505e0b8661..000000000000 --- a/include/comphelper/optional.hxx +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- 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 INCLUDED_COMPHELPER_OPTIONAL_HXX -#define INCLUDED_COMPHELPER_OPTIONAL_HXX - -#include <com/sun/star/beans/Optional.hpp> -#include <boost/optional.hpp> - -namespace comphelper { - -/// Object generators for boost::optional<T>, beans::Optional<T>: - -template <typename T> -inline ::boost::optional<T> make_optional( T const& v ) -{ - return ::boost::optional<T>(v); -} - -} // namespace comphelper - -#endif // ! defined(INCLUDED_COMPHELPER_OPTIONAL_HXX) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |