Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / CpeId.cc

diff --git a/zypp/CpeId.cc b/zypp/CpeId.cc
index e8b3015..776b8c5 100644 (file)
--- a/zypp/CpeId.cc
+++ b/zypp/CpeId.cc
@@ -415,7 +415,7 @@ namespace zypp
   //   class CpeId::WfnAttribute
   ///////////////////////////////////////////////////////////////////
 
-  const std::string & CpeId::EAttributeDef::asString( Enum val_r )
+  const std::string & CpeId::_AttributeDef::asString( Enum val_r )
   {
     static std::map<Enum,std::string> _table = {
 #define OUTS(N) { N, #N }
@@ -930,7 +930,7 @@ namespace zypp
 #if WFN_STRICT_SPEC
   //SetCompare CpeId::Value::setRelationMixinCompare( const CpeId::Value & trg ) const
   {
-    static const SetCompare kNeedsCloserLook( SetCompare::Enum(-1) );  // artificial Compare value
+    static const SetCompare _NeedsCloserLook( SetCompare::Enum(-1) );  // artificial Compare value
     static const SetCompare matchTabel[4][4] = {{
       /* ANY,          ANY             */ SetCompare::equal,
       /* ANY,          NA              */ SetCompare::properSuperset,
@@ -944,19 +944,19 @@ namespace zypp
     },{
       /* wildcardfree, ANY             */ SetCompare::properSubset,
       /* wildcardfree, NA              */ SetCompare::disjoint,
-      /* wildcardfree, wildcardfree    */ kNeedsCloserLook,    // equal or disjoint
+      /* wildcardfree, wildcardfree    */ _NeedsCloserLook,    // equal or disjoint
       /* wildcardfree, wildcarded      */ SetCompare::uncomparable,
     },{
       /* wildcarded,   ANY             */ SetCompare::properSubset,
       /* wildcarded,   NA              */ SetCompare::disjoint,
-      /* wildcarded,   wildcardfree    */ kNeedsCloserLook,    // superset or disjoint
+      /* wildcarded,   wildcardfree    */ _NeedsCloserLook,    // superset or disjoint
       /* wildcarded,   wildcarded      */ SetCompare::uncomparable,
     }};
 
     Type srcType = type();
     Type trgType = trg.type();
     SetCompare ret = matchTabel[srcType.asIntegral()][trgType.asIntegral()];
-    if ( ret == kNeedsCloserLook )
+    if ( ret == _NeedsCloserLook )
     {
       if ( srcType == Type::wildcardfree )     // trgType == Type::wildcardfree
       {