summaryrefslogtreecommitdiffstats
path: root/src/client/GraphModel.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2017-12-25 16:05:05 -0500
committerDavid Robillard <d@drobilla.net>2017-12-25 16:26:13 -0500
commit71808f61f7db48a7ab4e16537b94ee5686749909 (patch)
tree5529b7c60b2488ac9575ddcb597c905bde577399 /src/client/GraphModel.cpp
parent15b3b0e9f8823752f80c7e597a70749813e61c79 (diff)
downloadingen-71808f61f7db48a7ab4e16537b94ee5686749909.tar.gz
ingen-71808f61f7db48a7ab4e16537b94ee5686749909.tar.bz2
ingen-71808f61f7db48a7ab4e16537b94ee5686749909.zip
Remove superfluous using namespace declarations
Diffstat (limited to 'src/client/GraphModel.cpp')
-rw-r--r--src/client/GraphModel.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index e9fce5c4..762ed8ed 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -22,8 +22,6 @@
#include "ingen/client/ClientStore.hpp"
#include "ingen/client/GraphModel.hpp"
-using namespace std;
-
namespace Ingen {
namespace Client {
@@ -99,7 +97,7 @@ GraphModel::clear()
SPtr<ArcModel>
GraphModel::get_arc(const Node* tail, const Node* head)
{
- Arcs::iterator i = _arcs.find(make_pair(tail, head));
+ Arcs::iterator i = _arcs.find(std::make_pair(tail, head));
if (i != _arcs.end()) {
return dynamic_ptr_cast<ArcModel>(i->second);
} else {
@@ -136,9 +134,9 @@ GraphModel::add_arc(SPtr<ArcModel> arc)
assert(arc->tail() == existing->tail());
assert(arc->head() == existing->head());
} else {
- _arcs.insert(make_pair(make_pair(arc->tail().get(),
- arc->head().get()),
- arc));
+ _arcs.emplace(std::make_pair(arc->tail().get(),
+ arc->head().get()),
+ arc);
_signal_new_arc.emit(arc);
}
}
@@ -146,7 +144,7 @@ GraphModel::add_arc(SPtr<ArcModel> arc)
void
GraphModel::remove_arc(const Node* tail, const Node* head)
{
- Arcs::iterator i = _arcs.find(make_pair(tail, head));
+ Arcs::iterator i = _arcs.find(std::make_pair(tail, head));
if (i != _arcs.end()) {
SPtr<ArcModel> arc = dynamic_ptr_cast<ArcModel>(i->second);
_signal_removed_arc.emit(arc);