summaryrefslogtreecommitdiff
path: root/NT/src
diff options
context:
space:
mode:
Diffstat (limited to 'NT/src')
-rw-r--r--NT/src/rotor.cpp8
-rw-r--r--NT/src/rotor.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/NT/src/rotor.cpp b/NT/src/rotor.cpp
index 1c46cad..5f75826 100644
--- a/NT/src/rotor.cpp
+++ b/NT/src/rotor.cpp
@@ -9,6 +9,12 @@
using namespace std;
using namespace Rotor;
+std::istream& operator>> (std::istream &in, Rotor::Enum &en)
+{
+ in >> en.value;
+ return in;
+};
+
string Variable::get_connection_id(){
if (connection) return connection->get_id();
return "";
@@ -64,7 +70,7 @@ Json::Value Node::to_json(){
}
}
return node;
-}
+};
diff --git a/NT/src/rotor.h b/NT/src/rotor.h
index 72843a2..6d56299 100644
--- a/NT/src/rotor.h
+++ b/NT/src/rotor.h
@@ -93,17 +93,11 @@ namespace Rotor {
operator int () const { //overload C style cast to int
return value;
}
- friend istream& operator>> (istream &in, Enum &en);
+ friend std::istream& operator>> (std::istream &in, Rotor::Enum &en);
private:
std::vector<std::string> labels;
int value;
};
-
- istream& operator>> (istream &in, Enum &en)
- {
- in >> en.value;
- return in;
- };
class Audio_frame{
public: