use the libebml namespace directly

Matroska-Org · Sep 18, 2022 · 88334db · 88334db
1 parent 7085fc8
commit 88334db
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 22 deletions.
diff --git a/libebml2/legacy/ebml/EbmlBinary.h b/libebml2/legacy/ebml/EbmlBinary.h
@@ -31,7 +31,7 @@
 
 #include "ebml/EbmlElement.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     class EbmlBinary : public EbmlElement {
     public:

diff --git a/libebml2/legacy/ebml/EbmlConfig.h b/libebml2/legacy/ebml/EbmlConfig.h
@@ -31,8 +31,6 @@
 
 #include "corec/corec.h"
 
-#define LIBEBML_NAMESPACE libebml
-
 typedef uint8_t uint8;
 typedef uint16_t uint16;
 typedef uint32_t uint32;
@@ -50,7 +48,7 @@ typedef uint8_t binary;
 #define EBML_PRETTYLONGINT(c) (c)
 #endif // __GNUC__
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     enum endianess {
         big_endian,   ///< PowerPC, Alpha, 68000

diff --git a/libebml2/legacy/ebml/EbmlContexts.h b/libebml2/legacy/ebml/EbmlContexts.h
@@ -31,7 +31,7 @@
 
 #include "ebml/EbmlElement.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     const EbmlSemanticContext & GetEbmlGlobal_Context();
 

diff --git a/libebml2/legacy/ebml/EbmlCrc32.h b/libebml2/legacy/ebml/EbmlCrc32.h
@@ -31,7 +31,7 @@
 
 #include "ebml/EbmlBinary.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
 DECLARE_EBML_BINARY(EbmlCrc32)
     };

diff --git a/libebml2/legacy/ebml/EbmlDate.h b/libebml2/legacy/ebml/EbmlDate.h
@@ -31,7 +31,7 @@
 
 #include "ebml/EbmlElement.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     class EbmlDate : public EbmlElement {
     public:

diff --git a/libebml2/legacy/ebml/EbmlElement.h b/libebml2/legacy/ebml/EbmlElement.h
@@ -197,7 +197,7 @@
 #define EBML_CTX_IDX_INFO(c,i) *(c).GetSemantic(i).eClass     // EbmlSemanticContext -> EbmlCallbacks / ebml_context
 #define EBML_CTX_IDX_ID(c,i)   (c).GetSemantic(i).eClass->Id  // EbmlSemanticContext -> EbmlId
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     typedef int ScopeMode;
 

diff --git a/libebml2/legacy/ebml/EbmlFloat.h b/libebml2/legacy/ebml/EbmlFloat.h
@@ -31,7 +31,7 @@
 
 #include "ebml/EbmlElement.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     class EbmlFloat : public EbmlElement {
     public:

diff --git a/libebml2/legacy/ebml/EbmlHead.h b/libebml2/legacy/ebml/EbmlHead.h
@@ -31,7 +31,7 @@
 
 #include "ebml/EbmlMaster.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     DECLARE_EBML_MASTER(EbmlHead)
     };

diff --git a/libebml2/legacy/ebml/EbmlId.h b/libebml2/legacy/ebml/EbmlId.h
@@ -34,7 +34,7 @@
 #define EBML_ID_LENGTH(x)  (x).GetLength()
 #define EBML_ID_VALUE(x)   (fourcc_t)(x)
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     class EbmlId {
     public:

diff --git a/libebml2/legacy/ebml/EbmlMaster.h b/libebml2/legacy/ebml/EbmlMaster.h
@@ -36,7 +36,7 @@
 #define EBML_MASTER_RITERATOR EbmlMaster_rev_itr
 #define EBML_MASTER_CONST_RITERATOR EbmlMaster_rev_itr
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     class EbmlMaster;
 

diff --git a/libebml2/legacy/ebml/EbmlSInteger.h b/libebml2/legacy/ebml/EbmlSInteger.h
@@ -31,7 +31,7 @@
 
 #include "ebml/EbmlElement.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     class EbmlSInteger : public EbmlElement {
     public:

diff --git a/libebml2/legacy/ebml/EbmlStream.h b/libebml2/legacy/ebml/EbmlStream.h
@@ -31,7 +31,7 @@
 
 #include "ebml/IOCallback.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
     class EbmlStream {
     public:
         EbmlStream(IOCallback &);

diff --git a/libebml2/legacy/ebml/EbmlString.h b/libebml2/legacy/ebml/EbmlString.h
@@ -33,7 +33,7 @@
 
 #include "ebml/EbmlElement.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     class EbmlString : public EbmlElement {
     public:

diff --git a/libebml2/legacy/ebml/EbmlSubHead.h b/libebml2/legacy/ebml/EbmlSubHead.h
@@ -32,7 +32,7 @@
 #include "ebml/EbmlUInteger.h"
 #include "ebml/EbmlString.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     DECLARE_EBML_UINTEGER(EVersion)
     };

diff --git a/libebml2/legacy/ebml/EbmlUInteger.h b/libebml2/legacy/ebml/EbmlUInteger.h
@@ -31,7 +31,7 @@
 
 #include "ebml/EbmlElement.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     class EbmlUInteger : public EbmlElement {
     public:

diff --git a/libebml2/legacy/ebml/EbmlUnicodeString.h b/libebml2/legacy/ebml/EbmlUnicodeString.h
@@ -31,7 +31,7 @@
 
 #include "ebml/EbmlElement.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     /*!
       \class UTFstring

diff --git a/libebml2/legacy/ebml/EbmlVoid.h b/libebml2/legacy/ebml/EbmlVoid.h
@@ -31,7 +31,7 @@
 
 #include "ebml/EbmlBinary.h"
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
 DECLARE_EBML_VOID(EbmlVoid)
     public:

diff --git a/libebml2/legacy/ebml/IOCallback.h b/libebml2/legacy/ebml/IOCallback.h
@@ -36,7 +36,7 @@
 typedef struct stream stream;
 typedef struct stream_io stream_io;
 
-namespace LIBEBML_NAMESPACE {
+namespace libebml {
 
     enum seek_mode
     {

diff --git a/libebml2/legacy/legacy.cpp b/libebml2/legacy/legacy.cpp
@@ -55,7 +55,7 @@
 
 static parsercontext ccContext;
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 struct stream_io
 {
@@ -263,7 +263,7 @@ void ebml_done()
 }
 
 
-namespace LIBEBML_NAMESPACE
+namespace libebml
 {
 
 EbmlElement & DummyCreate()