projects
/
platform
/
upstream
/
libzypp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 14.45.0
[platform/upstream/libzypp.git]
/
zypp
/
sat
/
Map.cc
diff --git
a/zypp/sat/Map.cc
b/zypp/sat/Map.cc
index
b44a1f6
..
66afad2
100644
(file)
--- a/
zypp/sat/Map.cc
+++ b/
zypp/sat/Map.cc
@@
-27,10
+27,10
@@
namespace zypp
{ /////////////////////////////////////////////////////////////////
template<>
{ /////////////////////////////////////////////////////////////////
template<>
- s
at::detail::CMap * rwcowClone<sat::detail::CMap>( const sat::detail::C
Map * rhs )
+ s
truct ::_Map * rwcowClone<struct ::_Map>( const struct ::_
Map * rhs )
{
{
- s
at::detail::CMap * ret = new sat::detail::C
Map;
- ::map_init_clone( ret, const_cast<s
at::detail::C
Map *>(rhs) );
+ s
truct ::_Map * ret = new ::_
Map;
+ ::map_init_clone( ret, const_cast<s
truct ::_
Map *>(rhs) );
return ret;
}
return ret;
}
@@
-39,15
+39,15
@@
namespace zypp
{ /////////////////////////////////////////////////////////////////
Map::Map()
{ /////////////////////////////////////////////////////////////////
Map::Map()
- : _pimpl( new
detail::C
Map )
+ : _pimpl( new
::_
Map )
{ ::map_init( _pimpl.get(), 0 ); }
Map::Map( size_type size_r )
{ ::map_init( _pimpl.get(), 0 ); }
Map::Map( size_type size_r )
- : _pimpl( new
detail::C
Map )
+ : _pimpl( new
::_
Map )
{ ::map_init( _pimpl.get(), size_r ); }
Map::Map( PoolSizeType )
{ ::map_init( _pimpl.get(), size_r ); }
Map::Map( PoolSizeType )
- : _pimpl( new
detail::C
Map )
+ : _pimpl( new
::_
Map )
{ ::map_init( _pimpl.get(), Pool::instance().capacity() ); }
Map::~Map()
{ ::map_init( _pimpl.get(), Pool::instance().capacity() ); }
Map::~Map()
@@
-117,13
+117,13
@@
namespace zypp
return ret;
}
return ret;
}
- Map::operator
detail::CMap *()
// COW: nonconst version can't be inlined
- { return _pimpl.get(); } // without exposing
detail::C
Map
+ Map::operator
struct ::_Map *()
// COW: nonconst version can't be inlined
+ { return _pimpl.get(); } // without exposing
struct ::_
Map
bool operator==( const Map & lhs, const Map & rhs )
{
bool operator==( const Map & lhs, const Map & rhs )
{
- const
detail::C
Map * l = lhs;
- const
detail::C
Map * r = rhs;
+ const
struct ::_
Map * l = lhs;
+ const
struct ::_
Map * r = rhs;
return( l == r || ( l->size == r->size && ::memcmp( l->map, r->map, l->size ) == 0 ) );
}
return( l == r || ( l->size == r->size && ::memcmp( l->map, r->map, l->size ) == 0 ) );
}