Rename local variable "PIC" to "pic" so to avoid namespace

clash with gcc preprocessor PIC definition.

3 files changed, 8 insertions, 9 deletions

diff --git a/src/KM_log.cpp b/src/KM_log.cpp
index b2e9bde..7ae3242 100755
--- a/src/KM_log.cpp
+++ b/src/KM_log.cpp
@@ -148,7 +148,7 @@ Kumu::StreamLogSink::WriteEntry(const LogEntry& Entry)
 bool
 Kumu::LogEntry::TestFilter(i32_t filter) const
 {
- switch ( Type )
+  switch ( Type )
     {
     case LOG_CRIT:
       if ( (filter & LOG_ALLOW_CRIT) == 0 )
diff --git a/src/KM_log.h b/src/KM_log.h
index 6da77df..fb8d805 100755
--- a/src/KM_log.h
+++ b/src/KM_log.h
@@ -101,8 +101,7 @@ namespace Kumu
   const i32_t LOG_ALLOW_NONE       = 0x00000000;
   const i32_t LOG_ALLOW_ALL        = 0x000fffff;
 
-  // options are used to control display format
-  // default is 0 (
+  // options are used to control display format default is 0.
   const i32_t LOG_OPTION_TYPE      = 0x01000000;
   const i32_t LOG_OPTION_TIMESTAMP = 0x02000000;
   const i32_t LOG_OPTION_PID       = 0x04000000;
@@ -137,7 +136,7 @@ namespace Kumu
   };
 
 
-  typedef ArchivableList<LogEntry> LogEntryList_t;
+  typedef ArchivableList<LogEntry> LogEntryList;
   
   //
   class ILogSink
@@ -231,12 +230,12 @@ namespace Kumu
   class EntryListLogSink : public ILogSink
   {
     Mutex m_Lock;
-    LogEntryList_t& m_Target;
+    LogEntryList& m_Target;
     KM_NO_COPY_CONSTRUCT(EntryListLogSink);
     EntryListLogSink();
 
   public:
-    EntryListLogSink(LogEntryList_t& target) : m_Target(target) {}
+    EntryListLogSink(LogEntryList& target) : m_Target(target) {}
     virtual ~EntryListLogSink() {}
 
     void WriteEntry(const LogEntry& Entry);
diff --git a/src/MPEG2_Parser.cpp b/src/MPEG2_Parser.cpp
index 7b0a57b..8b5592e 100755
--- a/src/MPEG2_Parser.cpp
+++ b/src/MPEG2_Parser.cpp
@@ -306,9 +306,9 @@ public:
 	return RESULT_FALSE;
       }
 
-    Accessor::Picture PIC(b);
-    m_TemporalRef = PIC.TemporalRef();
-    m_FrameType = PIC.FrameType();
+    Accessor::Picture pic(b);
+    m_TemporalRef = pic.TemporalRef();
+    m_FrameType = pic.FrameType();
     m_FrameSize += s;
     return m_State.Goto_PIC();
   }