--- a/libupnpp/control/avtransport.cxx
+++ b/libupnpp/control/avtransport.cxx
@@ -34,7 +34,7 @@
#include "libupnpp/smallut.h"
using namespace std;
-using namespace STD_PLACEHOLDERS;
+using namespace std::placeholders;
using namespace UPnPP;
namespace UPnPClient {
@@ -107,26 +107,26 @@
}
void AVTransport::evtCallback(
- const STD_UNORDERED_MAP<std::string, std::string>& props)
+ const std::unordered_map<std::string, std::string>& props)
{
LOGDEB1("AVTransport::evtCallback:" << endl);
- for (STD_UNORDERED_MAP<std::string, std::string>::const_iterator it =
+ for (std::unordered_map<std::string, std::string>::const_iterator it =
props.begin(); it != props.end(); it++) {
if (it->first.compare("LastChange")) {
LOGINF("AVTransport:event: var not lastchange: "
- << it->first << " -> " << it->second << endl;);
+ << it->first << " -> " << it->second << endl);
continue;
}
LOGDEB1("AVTransport:event: "
- << it->first << " -> " << it->second << endl;);
-
- STD_UNORDERED_MAP<std::string, std::string> props1;
+ << it->first << " -> " << it->second << endl);
+
+ std::unordered_map<std::string, std::string> props1;
if (!decodeAVLastChange(it->second, props1)) {
LOGERR("AVTransport::evtCallback: bad LastChange value: "
<< it->second << endl);
return;
}
- for (STD_UNORDERED_MAP<std::string, std::string>::iterator it1 =
+ for (std::unordered_map<std::string, std::string>::iterator it1 =
props1.begin(); it1 != props1.end(); it1++) {
if (!getReporter()) {
LOGDEB1("AVTransport::evtCallback: " << it1->first << " -> "