diff --git a/src/JsonUtil.h b/src/JsonUtil.h index 0d6c7821aa..f8e47c5104 100644 --- a/src/JsonUtil.h +++ b/src/JsonUtil.h @@ -31,6 +31,15 @@ namespace JsonUtil for(unsigned i=0; i + static void SerializeVectorPointers(const vector &v, void fn(const T *, Json::Value &), Json::Value &root) + { + root = Json::Value(Json::arrayValue); + root.resize(v.size()); + for(unsigned i=0; i static void SerializeArray(const V &v, void fn(const T &, Json::Value &), Json::Value &root) diff --git a/src/TimingSegments.h b/src/TimingSegments.h index 37926abf61..ee594c77ac 100644 --- a/src/TimingSegments.h +++ b/src/TimingSegments.h @@ -19,6 +19,7 @@ enum TimingSegmentType SEGMENT_SCROLL, SEGMENT_FAKE, NUM_TimingSegmentType, + TimingSegmentType_Invalid, }; const RString& TimingSegmentTypeToString( TimingSegmentType tst ); @@ -76,7 +77,10 @@ struct TimingSegment * @return the starting beat. */ float GetBeat() const; - virtual TimingSegmentType GetType() const = 0; + virtual TimingSegmentType GetType() const + { + return TimingSegmentType_Invalid; + } /** * @brief Compares two DrivedSegments to see if one is less than the other.