fix conflict

Author: AndrewBMadison

Simulator/Edges/Neuro/AllNeuroEdges.cpp

@@ -72,7 +72,7 @@ void AllNeuroEdges::writeEdge(ostream &output, BGSIZE iEdg) const
    output << destVertexIndex_[iEdg] << ends;
    output << W_[iEdg] << ends;
    output << psr_[iEdg] << ends;
-   output << static_cast<int>(type_[iEdg]) << ends;
+   output << type_[iEdg] << ends;
    output << (inUse_[iEdg] == 1 ? "true" : "false") << ends;
 }
 
@@ -107,7 +107,7 @@ void AllNeuroEdges::printSynapsesProps() const
          cout << "W[" << i << "] = " << W_[i];
          cout << " sourNeuron: " << sourceVertexIndex_[i];
          cout << " desNeuron: " << destVertexIndex_[i];
-         cout << " type: " << static_cast<int>(type_[i]);
+         cout << " type: " << type_[i];
          cout << " psr: " << psr_[i];
          cout << " in_use:" << (inUse_[i] == 1 ? "true" : "false");
       }

Simulator/Edges/Neuro/AllSTDPSynapses_d.cpp

@@ -387,7 +387,7 @@ void AllSTDPSynapses::printGPUEdgesProps(void *allEdgesDeviceProps) const
             cout << "GPU W[" << i << "] = " << WPrint[i];
             cout << " GPU sourNeuron: " << sourceNeuronIndexPrint[i];
             cout << " GPU desNeuron: " << destNeuronIndexPrint[i];
-            cout << " GPU type: " << static_cast<int>(typePrint[i]);
+            cout << " GPU type: " << typePrint[i];
             cout << " GPU psr: " << psrPrint[i];
             cout << " GPU in_use:" << (inUsePrint[i] == 1 ? "true" : "false");
 

Simulator/Edges/Neuro/AllSpikingSynapses_d.cpp

@@ -405,7 +405,7 @@ void AllSpikingSynapses::printGPUEdgesProps(void *allEdgesDeviceProps) const
             cout << "GPU W[" << i << "] = " << WPrint[i];
             cout << " GPU sourNeuron: " << sourceNeuronIndexPrint[i];
             cout << " GPU desNeuron: " << destNeuronIndexPrint[i];
-            cout << " GPU type: " << static_cast<int>(typePrint[i]);
+            cout << " GPU type: " << typePrint[i];
             cout << " GPU psr: " << psrPrint[i];
             cout << " GPU in_use:" << (inUsePrint[i] == 1 ? "true" : "false");
             cout << " GPU decay: " << decayPrint[i];

Simulator/Utils/Global.h

@@ -150,6 +150,7 @@ inline std::ostream& operator<<(std::ostream& os, edgeType eT) {
     os << static_cast<int>(eT);
     return os;
 }
+
 // The default membrane capacitance.
 #define DEFAULT_Cm (3e-8)
 // The default membrane resistance.