git subtree pull latest AMF shared code in preparation for 1.4.7 release.

Merge commit '4248f048a11144c514a3029e24b7c94f7c61f031'

Author: tnarine-amd

amf/public/common/AMFFactory.h

@@ -29,6 +29,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 //
+#ifndef AMF_AMFFactory_h
+#define AMF_AMFFactory_h
 
 #pragma once
 
@@ -80,3 +82,4 @@ class AMFFactoryHelper
 };
 
 extern ::AMFFactoryHelper g_AMFFactory;
+#endif // AMF_AMFFactory_h

amf/public/common/AMFSTL.cpp

@@ -50,7 +50,7 @@ extern "C"
     extern int vscwprintf(const wchar_t* p_fmt, va_list p_args);
     extern int vscprintf(const char* p_fmt, va_list p_args);
 }
-#elif _MSC_VER <= 1911
+#elif _MSC_VER <= 1912
     #define snprintf _snprintf
     #define vscprintf _vscprintf
     #define vscwprintf _vscwprintf  //  Count chars without writing to string

amf/public/common/AMFSTL.h

@@ -30,8 +30,8 @@
 // THE SOFTWARE.
 //
 
-#ifndef __AMFSTL_h__
-#define __AMFSTL_h__
+#ifndef AMF_AMFSTL_h
+#define AMF_AMFSTL_h
 #pragma once
 
 #if defined(__GNUC__)
@@ -309,5 +309,5 @@ namespace amf
     #pragma GCC diagnostic pop
 #endif
 
-#endif // __AMFSTL_h__
+#endif // AMF_AMFSTL_h
 

amf/public/common/ByteArray.h

@@ -30,6 +30,10 @@
 // THE SOFTWARE.
 //
 
+#ifndef AMF_ByteArray_h
+#define AMF_ByteArray_h
+
+
 #pragma once
 #include "../include/core/Platform.h"
 #define    INIT_ARRAY_SIZE 1024
@@ -105,3 +109,4 @@ class AMFByteArray
     amf_uint8 *GetData() const { return m_pData; }
     amf_size GetSize() const { return m_iSize; }
 };
+#endif // AMF_ByteArray_h

amf/public/common/CurrentTime.h

@@ -20,8 +20,8 @@
 // THE SOFTWARE.
 //
 
-#ifndef __AMFCurrentTime_h__
-#define __AMFCurrentTime_h__
+#ifndef AMF_CurrentTime_h
+#define AMF_CurrentTime_h
 
 #include "public/include/core/Platform.h"
 #include "public/include/core/Interface.h"
@@ -49,4 +49,4 @@ namespace amf
 	typedef AMFInterfacePtr_T<AMFCurrentTime> AMFCurrentTimePtr;
 	//----------------------------------------------------------------------------------------------}
 }
-#endif // __AMFCurrentTime_h__
+#endif // AMF_CurrentTime_h

amf/public/common/CurrentTimeImpl.h

@@ -20,8 +20,8 @@
 // THE SOFTWARE.
 //
 
-#ifndef __AMFCurrentTimeImpl_h__
-#define __AMFCurrentTimeImpl_h__
+#ifndef AMF_CurrentTimeImpl_h
+#define AMF_CurrentTimeImpl_h
 
 #include "public/common/CurrentTime.h"
 #include "public/common/InterfaceImpl.h"
@@ -55,4 +55,4 @@ class AMFCurrentTimeImpl : public AMFInterfaceImpl<AMFCurrentTime>
 typedef AMFInterfacePtr_T<AMFCurrentTime> AMFCurrentTimePtr;
 //----------------------------------------------------------------------------------------------}
 }
-#endif // __AMFCurrentTimeImpl_h__
+#endif // AMF_CurrentTimeImpl_h

amf/public/common/DataStream.h

@@ -36,8 +36,8 @@
  * @brief AMFDataStream declaration
  ***************************************************************************************************
  */
-#ifndef __AMFDataStream_h__
-#define __AMFDataStream_h__
+#ifndef AMF_DataStream_h
+#define AMF_DataStream_h
 #pragma once
 
 #include "../include/core/Interface.h"
@@ -106,4 +106,4 @@ namespace amf
 
 } //namespace amf
 
-#endif // __AMFDataStream_h__
+#endif // AMF_DataStream_h

amf/public/common/DataStreamFile.h

@@ -30,6 +30,9 @@
 // THE SOFTWARE.
 //
 
+#ifndef AMF_DataStreamFile_h
+#define AMF_DataStreamFile_h
+
 #pragma once
 
 #include "DataStream.h"
@@ -60,3 +63,4 @@ namespace amf
         std::wstring m_Path;
     };
 } //namespace amf
+#endif // AMF_DataStreamFile_h

amf/public/common/DataStreamMemory.h

@@ -30,6 +30,9 @@
 // THE SOFTWARE.
 //
 
+#ifndef AMF_DataStreamMemory_h
+#define AMF_DataStreamMemory_h
+
 #pragma once
 
 #include "DataStream.h"
@@ -70,3 +73,5 @@ namespace amf
         AMFDataStreamMemoryImpl& operator=(const AMFDataStreamMemoryImpl&);
     };
 } //namespace amf
+
+#endif // AMF_DataStreamMemory_h

amf/public/common/IOCapsImpl.h

@@ -30,6 +30,9 @@
 // THE SOFTWARE.
 //
 
+#ifndef AMF_IOCapsImpl_h
+#define AMF_IOCapsImpl_h
+
 #pragma once
 
 #include "InterfaceImpl.h"
@@ -126,3 +129,4 @@ namespace amf
         MemoryType::Collection      m_MemoryTypes;
     };
 }
+#endif // AMF_IOCapsImpl_h