Bad file, but need a record of key comment.
I think this is the key issue. gcc is doing some magic for us. VS20** is forcing us to do it right. Yes AJ, that means Windows is better on something. Revert this file if needed: the record is now made.
This commit is contained in:
+11
-7
@@ -13,7 +13,7 @@ struct BaseTimingSegment
|
|||||||
|
|
||||||
/** @brief Set up a BaseTimingSegment with default values. */
|
/** @brief Set up a BaseTimingSegment with default values. */
|
||||||
BaseTimingSegment():
|
BaseTimingSegment():
|
||||||
startingRow(-1) {};
|
startingRow(static_cast<int>(-1)) {};
|
||||||
|
|
||||||
BaseTimingSegment(const BaseTimingSegment &b)
|
BaseTimingSegment(const BaseTimingSegment &b)
|
||||||
{
|
{
|
||||||
@@ -22,10 +22,11 @@ struct BaseTimingSegment
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Set up a BaseTimingSegment with specified values.
|
* @brief Set up a BaseTimingSegment with specified values.
|
||||||
* @param s the starting row / beat. */
|
* @param s the starting row / beat.
|
||||||
|
*
|
||||||
|
* NOTE: On Windows, it's passing in the Segments, not ints or floats. */
|
||||||
template <typename StartType>
|
template <typename StartType>
|
||||||
BaseTimingSegment(StartType s):
|
BaseTimingSegment(StartType s): startingRow(ToNoteRow(s)) {}
|
||||||
startingRow(ToNoteRow(s)) {};
|
|
||||||
|
|
||||||
virtual ~BaseTimingSegment();
|
virtual ~BaseTimingSegment();
|
||||||
|
|
||||||
@@ -67,7 +68,7 @@ template <class DerivedSegment>
|
|||||||
struct TimingSegment: public BaseTimingSegment
|
struct TimingSegment: public BaseTimingSegment
|
||||||
{
|
{
|
||||||
|
|
||||||
TimingSegment(): BaseTimingSegment() {};
|
TimingSegment(): BaseTimingSegment(static_cast<int>(-1)) {};
|
||||||
|
|
||||||
template <typename StartType>
|
template <typename StartType>
|
||||||
TimingSegment(StartType s): BaseTimingSegment(s) {};
|
TimingSegment(StartType s): BaseTimingSegment(s) {};
|
||||||
@@ -399,7 +400,10 @@ struct BPMSegment : public TimingSegment<BPMSegment>
|
|||||||
* It is best to override the values as soon as possible.
|
* It is best to override the values as soon as possible.
|
||||||
*/
|
*/
|
||||||
BPMSegment() :
|
BPMSegment() :
|
||||||
TimingSegment<BPMSegment>(), bps(-1.0f) { }
|
TimingSegment<BPMSegment>(static_cast<int>(-1)), bps(-1.0f) { }
|
||||||
|
|
||||||
|
operator int() const { return 1; }
|
||||||
|
operator float() const { return 2.0f; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Creates a BPM Segment with the specified starting row and beats per second.
|
* @brief Creates a BPM Segment with the specified starting row and beats per second.
|
||||||
@@ -408,7 +412,7 @@ struct BPMSegment : public TimingSegment<BPMSegment>
|
|||||||
*/
|
*/
|
||||||
template <typename StartType>
|
template <typename StartType>
|
||||||
BPMSegment( StartType s, float bpm ):
|
BPMSegment( StartType s, float bpm ):
|
||||||
TimingSegment<BPMSegment>(max((StartType)0, s)), bps(0.0f) { SetBPM(bpm); }
|
TimingSegment<BPMSegment>(max((StartType)0, ToNoteRow(s))), bps(0.0f) { SetBPM(bpm); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Get the label in this LabelSegment.
|
* @brief Get the label in this LabelSegment.
|
||||||
|
|||||||
Reference in New Issue
Block a user