It does not look like my partial.hxx and medication.hxx file were attached, so
they are pasted below.
#ifndef INCLUDED_CONFIGMGR_SOURCE_PARTIAL_HXX
#define INCLUDED_CONFIGMGR_SOURCE_PARTIAL_HXX
#include "sal/config.h"
#include <boost/unordered_map.hpp> // using the boost container because it
explicitly allows recursive types
#include <set>
#include "boost/noncopyable.hpp"
#include "path.hxx"
#include "rtl/ustring.hxx"
namespace configmgr {
class Partial: private boost::noncopyable {
public:
enum Containment { CONTAINS_NOT, CONTAINS_SUBNODES, CONTAINS_NODE };
Partial(
std::set< rtl::OUString > const & includedPaths,
std::set< rtl::OUString > const & excludedPaths);
~Partial();
Containment contains(Path const & path) const;
private:
struct Node {
typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash >
Children;
Node(): startInclude(false) {}
void clear() { startInclude=false; children.clear(); }
Children children;
bool startInclude;
};
Node root_;
};
}
#endif
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef INCLUDED_CONFIGMGR_SOURCE_MODIFICATIONS_HXX
#define INCLUDED_CONFIGMGR_SOURCE_MODIFICATIONS_HXX
#include "sal/config.h"
#include <map>
#include "boost/noncopyable.hpp"
#include "path.hxx"
namespace rtl { class OUString; }
namespace configmgr {
class Modifications: private boost::noncopyable {
public:
struct Node {
typedef std::map< rtl::OUString, Node > Children;
Children children;
};
Modifications();
~Modifications();
void add(Path const & path);
void remove(Path const & path);
Node const & getRoot() const;
private:
Node root_;
};
}
#endif
-----Original Message-----
From: Steele, Raymond
Sent: Tuesday, September 10, 2013 9:12 AM
To: Herbert Duerr; dev@openoffice.apache.org
Subject: RE: EXTERNAL: Re: Building comphelper
Attached are my two files in question. I reverted modifications.hxx back to the
original and kept partial.hxx as you patched in
http://svn.apache.org/viewvc?view=revision&revision=1515285
Here is what I am receiving upon compile of configmgr.
bash-3.2# dmake
Compiling: configmgr/source/access.cxx
Compiling: configmgr/source/broadcaster.cxx
Compiling: configmgr/source/childaccess.cxx
Compiling: configmgr/source/components.cxx
Compiling: configmgr/source/configurationprovider.cxx
Compiling: configmgr/source/configurationregistry.cxx
"/opt/aoo-4.0.0/main/configmgr/source/configurationregistry.cxx", line 800:
Warning: "::RegistryKey::createKey(const rtl::OUString&)" is expected to return
a value.
"/opt/aoo-4.0.0/main/configmgr/source/configurationregistry.cxx", line 831:
Warning: "::RegistryKey::openKeys()" is expected to return a value.
"/opt/aoo-4.0.0/main/configmgr/source/configurationregistry.cxx", line 842:
Warning: "::RegistryKey::getKeyNames()" is expected to return a value.
3 Warning(s) detected.
Compiling: configmgr/source/data.cxx
Compiling: configmgr/source/defaultprovider.cxx
Compiling: configmgr/source/groupnode.cxx
Compiling: configmgr/source/localizedpropertynode.cxx
Compiling: configmgr/source/localizedvaluenode.cxx
Compiling: configmgr/source/lock.cxx
Compiling: configmgr/source/modifications.cxx
Compiling: configmgr/source/node.cxx
"/opt/aoo-4.0.0/main/configmgr/source/node.cxx", line 52: Warning:
"configmgr::Node::getMembers()" is expected to return a value.
1 Warning(s) detected.
Compiling: configmgr/source/nodemap.cxx
Compiling: configmgr/source/parsemanager.cxx
Compiling: configmgr/source/partial.cxx
"/usr/local/include/boost/unordered/detail/emplace_args.hpp", line 199: Error:
Could not find a match for boost::tuples::get<boost::tuples::N,
boost::tuples::HT, boost::tuples::TT>(const
boost::tuples::tuple<boost::tuples::null_type, boost::tuples::null_type,
boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type,
boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type,
boost::tuples::null_type, boost::tuples::null_type>) needed in
boost::unordered::detail::construct_from_tuple<configmgr::Partial::Node,
boost::tuples::null_type>(configmgr::Partial::Node*, const
boost::tuples::tuple<boost::tuples::null_type, boost::tuples::null_type,
boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type,
boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type,
boost::tuples::null_type, boost::tuples::null_type>&).
"/usr/local/include/boost/unordered/detail/emplace_args.hpp", line 350:
Where: While instantiating
"boost::unordered::detail::construct_from_tuple<configmgr::Partial::Node,
boost::tuples::null_type>(configmgr::Partial::Node*, const
boost::tuples::tuple<boost::tuples::null_type, boost::tuples::null_type,
boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type,
boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type,
boost::tuples::null_type, boost::tuples::null_type>&)".
"/usr/local/include/boost/unordered/detail/emplace_args.hpp", line 350:
Where: Instantiated from boost::unordered::unordered_map<rtl::OUString,
configmgr::Partial::Node, rtl::OUStringHash, _STL::equal_to<rtl::OUString>,
_STL::allocator<_STL::pair<const rtl::OUString,
configmgr::Partial::Node>>>::operator[](const rtl::OUString&).
"/opt/aoo-4.0.0/main/configmgr/source/partial.cxx", line 82: Where:
Instantiated from non-template code.
1 Error(s) detected.
dmake: Error code 2, while making '../unxsoli4.pro/slo/partial.obj'
________________________________________
From: Herbert Duerr [h...@apache.org]
Sent: Tuesday, September 10, 2013 3:34 AM
To: dev@openoffice.apache.org
Cc: Steele, Raymond
Subject: Re: EXTERNAL: Re: Building comphelper
On 09.09.2013 19:59, Steele, Raymond wrote:
> I am using trying to build the source code that I pulled from here:
>
> http://www.apache.org/dist/openoffice/4.0.0/source/
Thanks for the info. Now I know better what to patch.
> I make the changes to my local copy of the files specified at
> http://svn.apache.org/viewvc?view=revision&revision=1515285
>
> Now, I am receiving the following. Looking into the cause now.
> [...]
> "/opt/aoo-4.0.0/main/solver/400/unxsoli4.pro/inc/stl/stl/_tree.c", line 590:
> Error: Too many arguments in call to "rtl::OUStringHash::operator()(const
> rtl::OUString&) const".
> [...]
The patch in the revision I mentioned was for a newer branch than
AOO400: To adapt it to your tree please keep the patched partial.hxx and revert
modifications.hxx to its original.
Herbert
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org
