Imported Upstream version 14.45.0

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

diff --git a/zypp/Arch.cc b/zypp/Arch.cc
index 16d53a8..05ec4a3 100644 (file)
--- a/zypp/Arch.cc
+++ b/zypp/Arch.cc
@@ -16,7 +16,7 @@
 #include "zypp/base/Logger.h"
 #include "zypp/base/Exception.h"
 #include "zypp/base/NonCopyable.h"
-#include "zypp/base/Hash.h"
+#include "zypp/base/Tr1hash.h"
 #include "zypp/Arch.h"
 #include "zypp/Bit.h"
 
@@ -238,7 +238,7 @@ namespace zypp
       typedef Arch::CompatEntry       CompatEntry;
       typedef CompatEntry::CompatBits CompatBits;
 
-      typedef std::unordered_set<CompatEntry> Set;
+      typedef std::tr1::unordered_set<CompatEntry> Set;
       typedef Set::iterator           iterator;
       typedef Set::const_iterator     const_iterator;
 
@@ -403,10 +403,10 @@ namespace zypp
       {
         const CompatEntry & target( assertCompatSetEntry( targetArch_r ) );
         target.addCompatBit( assertCompatSetEntry( arch0_r )._idBit );
-#define SETARG(N) if ( arch##N##_r.empty() ) return; target.addCompatBit( assertCompatSetEntry( arch##N##_r )._idBit )
-        SETARG(1); SETARG(2); SETARG(3); SETARG(4);
-        SETARG(5); SETARG(6); SETARG(7); SETARG(8); SETARG(9);
-#undef SETARG
+#define _SETARG(N) if ( arch##N##_r.empty() ) return; target.addCompatBit( assertCompatSetEntry( arch##N##_r )._idBit )
+        _SETARG(1); _SETARG(2); _SETARG(3); _SETARG(4);
+        _SETARG(5); _SETARG(6); _SETARG(7); _SETARG(8); _SETARG(9);
+#undef _SETARG
       }
 
     private: