[OMPT-svn-commit] SF.net SVN: modplug:[2831] trunk/OpenMPT

[<man...@us...>]

Revision: 2831
          http://sourceforge.net/p/modplug/code/2831
Author:   manxorist
Date:     2013-10-05 05:50:55 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
[Mod] libopenmpt: Remove LIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING .
[Mod] libopenmpt: Bump API version to 0.1 .

Modified Paths:
--------------
    trunk/OpenMPT/libopenmpt/libopenmpt_cxx.cpp
    trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.cpp
    trunk/OpenMPT/libopenmpt/libopenmpt_internal.h
    trunk/OpenMPT/libopenmpt/libopenmpt_version.h
    trunk/OpenMPT/openmpt123/Makefile
    trunk/OpenMPT/openmpt123/openmpt123_config.hpp

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_cxx.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_cxx.cpp	2013-10-05 03:17:54 UTC (rev 2830)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_cxx.cpp	2013-10-05 05:50:55 UTC (rev 2831)
@@ -21,13 +21,13 @@
 
 namespace openmpt {
 
-exception::exception( const std::string & text_ ) throw()
+exception::exception( const std::string & text ) throw()
 	: std::exception()
 	, text(0)
 {
-	text = (char*)std::malloc( text_.length() + 1 );
-	if ( text ) {
-		std::memcpy( text, text_.c_str(), text_.length() + 1 );
+	this->text = (char*)std::malloc( text.length() + 1 );
+	if ( this->text ) {
+		std::memcpy( this->text, text.c_str(), text.length() + 1 );
 	}
 }
 

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.cpp	2013-10-05 03:17:54 UTC (rev 2830)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.cpp	2013-10-05 05:50:55 UTC (rev 2831)
@@ -2,7 +2,6 @@
 #include "foobar2000/SDK/foobar2000.h"
 #include "foobar2000/helpers/helpers.h"
 
-#define LIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING
 #include "libopenmpt.hpp"
 
 #include <algorithm>

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_internal.h
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_internal.h	2013-10-05 03:17:54 UTC (rev 2830)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_internal.h	2013-10-05 05:50:55 UTC (rev 2831)
@@ -10,11 +10,6 @@
 #ifndef LIBOPENMPT_INTERNAL_H
 #define LIBOPENMPT_INTERNAL_H
 
-/* disable alpha version warning in internal builds */
-#ifndef LIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING
-#define LIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING
-#endif
-
 #include "libopenmpt_config.h"
 
 #if defined(NO_LIBOPENMPT_C)

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_version.h
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_version.h	2013-10-05 03:17:54 UTC (rev 2830)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_version.h	2013-10-05 05:50:55 UTC (rev 2831)
@@ -11,7 +11,7 @@
 #define LIBOPENMPT_VERSION_H
 
 #define OPENMPT_API_VERSION_MAJOR 0
-#define OPENMPT_API_VERSION_MINOR 0
+#define OPENMPT_API_VERSION_MINOR 1
 
 #define OPENMPT_API_VERSION ((OPENMPT_API_VERSION_MAJOR<<24)|(OPENMPT_API_VERSION_MINOR<<16))
 
@@ -19,12 +19,4 @@
 #define OPENMPT_API_VERSION_STRINGIZE(x) OPENMPT_API_VERSION_HELPER_STRINGIZE(x)
 #define OPENMPT_API_VERSION_STRING OPENMPT_API_VERSION_STRINGIZE(OPENMPT_API_VERSION_MAJOR) "." OPENMPT_API_VERSION_STRINGIZE(OPENMPT_API_VERSION_MINOR)
 
-#ifndef LIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING
-#ifdef __cplusplus
-static_assert( false, "libopenmpt is currently in alpha stage, do not rely on ABI or even API compatibility for the next few months yet. #define LIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING to acknowledge this warning." );
-#else
-typedef char OPENMPT_STATIC_ASSERT[-1]; /* libopenmpt is currently in alpha stage, do not rely on ABI or even API compatibility for the next few months yet. #define LIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING to acknowledge this warning. */
-#endif
-#endif /* LIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING */
-
 #endif /* LIBOPENMPT_VERSION_H */

Modified: trunk/OpenMPT/openmpt123/Makefile
===================================================================
--- trunk/OpenMPT/openmpt123/Makefile	2013-10-05 03:17:54 UTC (rev 2830)
+++ trunk/OpenMPT/openmpt123/Makefile	2013-10-05 05:50:55 UTC (rev 2831)
@@ -61,7 +61,6 @@
 endif
 
 #CPPFLAGS += -DMPT_COMPILER_GENERIC
-CPPFLAGS += -DLIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING
 
 #CXXFLAGS += -mtune=generic
 #CFLAGS   += -mtune=generic

Modified: trunk/OpenMPT/openmpt123/openmpt123_config.hpp
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123_config.hpp	2013-10-05 03:17:54 UTC (rev 2830)
+++ trunk/OpenMPT/openmpt123/openmpt123_config.hpp	2013-10-05 05:50:55 UTC (rev 2831)
@@ -25,10 +25,6 @@
 
 #endif // _MSC_VER
 
-#ifndef LIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING
-#define LIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING
-#endif
-
 #define OPENMPT123_VERSION_STRING "0.1"
 
 #endif // OPENMPT123_CONFIG_HPP

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.