View | Details | Raw Unified | Return to bug 164180
Collapse All | Expand All

(-)files/patch-src__bmff__typebmff.cpp (+35 lines)
Added Link Here
1 
--- ./src/bmff/typebmff.cpp.orig	2009-07-14 03:07:10.000000000 +0400
2 
+++ ./src/bmff/typebmff.cpp	2012-01-15 22:14:12.057757646 +0400
3 
@@ -23,19 +23,12 @@
4
5 
 #include "impl.h"
6
7 
-// VStudio idiocy prevents defining template instanced static data
8 
-// in a namespace. Workaround it by defining in global scope.
9 
-// Other platforms will continue to put things in the proper namespace.
10 
-#if defined( _MSC_VER )
11 
-using namespace mp4v2::impl::bmff;
12 
-#else
13 
-namespace mp4v2 { namespace impl { namespace bmff {
14 
-#endif
15 
+namespace mp4v2 { namespace impl {
16
17 
 ///////////////////////////////////////////////////////////////////////////////
18
19 
 template <>
20 
-const EnumLanguageCode::Entry EnumLanguageCode::data[] = {
21 
+const bmff::EnumLanguageCode::Entry bmff::EnumLanguageCode::data[] = {
22 
     { mp4v2::impl::bmff::ILC_AAR,  "aar",  "Afar" },
23 
     { mp4v2::impl::bmff::ILC_ABK,  "abk",  "Abkhazian" },
24 
     { mp4v2::impl::bmff::ILC_ACE,  "ace",  "Achinese" },
25 
@@ -526,9 +519,7 @@
26
27 
 ///////////////////////////////////////////////////////////////////////////////
28
29 
-#if defined( _MSC_VER )
30 
-namespace mp4v2 { namespace impl { namespace bmff {
31 
-#endif
32 
+namespace bmff {
33
34 
 ///////////////////////////////////////////////////////////////////////////////
35
(-)files/patch-src__itmf__type.cpp (+80 lines)
Added Link Here
1 
--- ./src/itmf/type.cpp.orig	2009-07-14 03:07:08.000000000 +0400
2 
+++ ./src/itmf/type.cpp	2012-01-15 22:14:12.054748862 +0400
3 
@@ -24,19 +24,12 @@
4
5 
 #include "impl.h"
6
7 
-// VStudio idiocy prevents defining template instanced static data
8 
-// in a namespace. Workaround it by defining in global scope.
9 
-// Other platforms will continue to put things in the proper namespace.
10 
-#if defined( _MSC_VER )
11 
-using namespace mp4v2::impl::itmf;
12 
-#else
13 
-namespace mp4v2 { namespace impl { namespace itmf {
14 
-#endif
15 
+namespace mp4v2 { namespace impl {
16
17 
 ///////////////////////////////////////////////////////////////////////////////
18
19 
 template <>
20 
-const EnumBasicType::Entry EnumBasicType::data[] = {
21 
+const itmf::EnumBasicType::Entry itmf::EnumBasicType::data[] = {
22 
     { mp4v2::impl::itmf::BT_IMPLICIT,  "implicit",  "implicit" },
23 
     { mp4v2::impl::itmf::BT_UTF8,      "utf8",      "UTF-8" },
24 
     { mp4v2::impl::itmf::BT_UTF16,     "utf16",     "UTF-16" },
25 
@@ -64,7 +57,7 @@
26 
 ///////////////////////////////////////////////////////////////////////////////
27
28 
 template <>
29 
-const EnumGenreType::Entry EnumGenreType::data[] = {
30 
+const itmf::EnumGenreType::Entry itmf::EnumGenreType::data[] = {
31 
     { mp4v2::impl::itmf::GENRE_BLUES,             "blues",             "Blues" },
32 
     { mp4v2::impl::itmf::GENRE_CLASSIC_ROCK,      "classicrock",       "Classic Rock" },
33 
     { mp4v2::impl::itmf::GENRE_COUNTRY,           "country",           "Country" },
34 
@@ -200,7 +193,7 @@
35 
 ///////////////////////////////////////////////////////////////////////////////
36
37 
 template <>
38 
-const EnumStikType::Entry EnumStikType::data[] = {
39 
+const itmf::EnumStikType::Entry itmf::EnumStikType::data[] = {
40 
     { mp4v2::impl::itmf::STIK_OLD_MOVIE,    "oldmovie",    "Movie" },
41 
     { mp4v2::impl::itmf::STIK_NORMAL,       "normal",      "Normal" },
42 
     { mp4v2::impl::itmf::STIK_AUDIOBOOK,    "audiobook",   "Audio Book" },
43 
@@ -216,7 +209,7 @@
44 
 ///////////////////////////////////////////////////////////////////////////////
45
46 
 template <>
47 
-const EnumAccountType::Entry EnumAccountType::data[] = {
48 
+const itmf::EnumAccountType::Entry itmf::EnumAccountType::data[] = {
49 
     { mp4v2::impl::itmf::AT_ITUNES,  "itunes",   "iTunes" },
50 
     { mp4v2::impl::itmf::AT_AOL,     "aol",      "AOL" },
51
52 
@@ -226,7 +219,7 @@
53 
 ///////////////////////////////////////////////////////////////////////////////
54
55 
 template <>
56 
-const EnumCountryCode::Entry EnumCountryCode::data[] = {
57 
+const itmf::EnumCountryCode::Entry itmf::EnumCountryCode::data[] = {
58 
     { mp4v2::impl::itmf::CC_USA,  "usa",   "United States" },
59 
     { mp4v2::impl::itmf::CC_USA,  "fra",   "France" },
60 
     { mp4v2::impl::itmf::CC_DEU,  "ger",   "Germany" },
61 
@@ -256,7 +249,7 @@
62 
 ///////////////////////////////////////////////////////////////////////////////
63
64 
 template <>
65 
-const EnumContentRating::Entry EnumContentRating::data[] = {
66 
+const itmf::EnumContentRating::Entry itmf::EnumContentRating::data[] = {
67 
     { mp4v2::impl::itmf::CR_NONE,      "none",       "None" },
68 
     { mp4v2::impl::itmf::CR_CLEAN,     "clean",      "Clean" },
69 
     { mp4v2::impl::itmf::CR_EXPLICIT,  "explicit",   "Explicit" },
70 
@@ -266,9 +259,7 @@
71
72 
 ///////////////////////////////////////////////////////////////////////////////
73
74 
-#if defined( _MSC_VER )
75 
-namespace mp4v2 { namespace impl { namespace itmf {
76 
-#endif
77 
+namespace itmf {
78
79 
 ///////////////////////////////////////////////////////////////////////////////
80

Return to bug 164180