Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[2287] trunk/OpenMPT
|
From: <man...@us...> - 2013-06-02 12:09:12
|
Revision: 2287
http://sourceforge.net/p/modplug/code/2287
Author: manxorist
Date: 2013-06-02 12:09:05 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
[Ref] Remove empty semicolons after closing namespace scope.
[Ref] Remove comma at the end of enum members list in common/ (makes common/ gcc -pedantic clean).
[Ref] sscanf %x expects pointer to unsigned int instead of int.
Modified Paths:
--------------
trunk/OpenMPT/common/Logging.h
trunk/OpenMPT/common/StringFixer.h
trunk/OpenMPT/common/misc_util.h
trunk/OpenMPT/common/serialization_utils.h
trunk/OpenMPT/common/version.cpp
trunk/OpenMPT/common/version.h
trunk/OpenMPT/soundlib/MIDIEvents.h
trunk/OpenMPT/soundlib/ModInstrument.cpp
trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
trunk/OpenMPT/soundlib/tuning.cpp
trunk/OpenMPT/soundlib/tuningbase.h
trunk/OpenMPT/soundlib/tuningcollection.h
Modified: trunk/OpenMPT/common/Logging.h
===================================================================
--- trunk/OpenMPT/common/Logging.h 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/common/Logging.h 2013-06-02 12:09:05 UTC (rev 2287)
@@ -16,7 +16,7 @@
LogNotification = 2,
LogInformation = 3,
LogWarning = 4,
- LogError = 5,
+ LogError = 5
};
Modified: trunk/OpenMPT/common/StringFixer.h
===================================================================
--- trunk/OpenMPT/common/StringFixer.h 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/common/StringFixer.h 2013-06-02 12:09:05 UTC (rev 2287)
@@ -84,7 +84,7 @@
spacePadded,
// Reading: String may contain null characters anywhere. The last character is ignored (it is supposed to be 0).
// Writing: A space-padded string with a trailing null is written.
- spacePaddedNull,
+ spacePaddedNull
};
Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/common/misc_util.h 2013-06-02 12:09:05 UTC (rev 2287)
@@ -359,7 +359,7 @@
return intval;
}
-};
+}
namespace Util {
Modified: trunk/OpenMPT/common/serialization_utils.h
===================================================================
--- trunk/OpenMPT/common/serialization_utils.h 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/common/serialization_utils.h 2013-06-02 12:09:05 UTC (rev 2287)
@@ -76,7 +76,7 @@
SNW_DATASIZETYPE_OVERFLOW = (0x13) | SNT_FAILURE,
SNW_MAX_WRITE_COUNT_REACHED = (0x14) | SNT_FAILURE,
SNW_SUBENTRY_FAILURE = (0x15) | SNT_FAILURE,
- SNW_INSUFFICIENT_DATASIZETYPE = (0x16) | SNT_FAILURE,
+ SNW_INSUFFICIENT_DATASIZETYPE = (0x16) | SNT_FAILURE
};
bool IsPrintableId(const void* pvId, const size_t nLength); // Return true if given id is printable, false otherwise.
Modified: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/common/version.cpp 2013-06-02 12:09:05 UTC (rev 2287)
@@ -90,7 +90,7 @@
VersionNum ToNum(const std::string &s_)
{
const char *s = s_.c_str();
- int v1, v2, v3, v4;
+ unsigned int v1, v2, v3, v4;
sscanf(s, "%x.%x.%x.%x", &v1, &v2, &v3, &v4);
return ((v1 << 24) | (v2 << 16) | (v3 << 8) | v4);
}
Modified: trunk/OpenMPT/common/version.h
===================================================================
--- trunk/OpenMPT/common/version.h 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/common/version.h 2013-06-02 12:09:05 UTC (rev 2287)
@@ -84,4 +84,4 @@
// Returns a multi-line string containing developer contact and community addresses
std::string GetContactString();
-}; //namespace MptVersion
+} //namespace MptVersion
Modified: trunk/OpenMPT/soundlib/MIDIEvents.h
===================================================================
--- trunk/OpenMPT/soundlib/MIDIEvents.h 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/soundlib/MIDIEvents.h 2013-06-02 12:09:05 UTC (rev 2287)
@@ -286,4 +286,4 @@
// Get second data byte from a MIDI event
uint8 GetDataByte2FromEvent(uint32 midiMsg);
-};
+}
Modified: trunk/OpenMPT/soundlib/ModInstrument.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModInstrument.cpp 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/soundlib/ModInstrument.cpp 2013-06-02 12:09:05 UTC (rev 2287)
@@ -70,7 +70,7 @@
}
}
}
-};
+}
// Get envelope value at a given tick. Returns value in range [0.0, 1.0].
@@ -117,7 +117,7 @@
}
return Clamp(value, 0.0f, 1.0f);
-};
+}
ModInstrument::ModInstrument(SAMPLEINDEX sample)
Modified: trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2013-06-02 12:09:05 UTC (rev 2287)
@@ -348,7 +348,7 @@
*p = static_cast<T>(dVal);
}
}
-};
+}
// Remove DC offset
Modified: trunk/OpenMPT/soundlib/tuning.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuning.cpp 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/soundlib/tuning.cpp 2013-06-02 12:09:05 UTC (rev 2287)
@@ -43,7 +43,7 @@
uint16 m_nWriteCount;
static const uint16 s_nDefaultWriteCount = (uint16_max >> 2);
};
-};
+}
using namespace CTuningS11n;
Modified: trunk/OpenMPT/soundlib/tuningbase.h
===================================================================
--- trunk/OpenMPT/soundlib/tuningbase.h 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/soundlib/tuningbase.h 2013-06-02 12:09:05 UTC (rev 2287)
@@ -35,7 +35,7 @@
using std::ostream;
using std::map;
-namespace srlztn {class Ssb;};
+namespace srlztn {class Ssb;}
#ifdef BUILD_TUNINGBASE_AS_TEMPLATE
Modified: trunk/OpenMPT/soundlib/tuningcollection.h
===================================================================
--- trunk/OpenMPT/soundlib/tuningcollection.h 2013-06-02 12:04:00 UTC (rev 2286)
+++ trunk/OpenMPT/soundlib/tuningcollection.h 2013-06-02 12:09:05 UTC (rev 2287)
@@ -19,7 +19,7 @@
namespace CTuningS11n
{
void ReadTuning(istream& iStrm, CTuningCollection& Tc, const size_t);
-};
+}
//=====================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
