Changeset 773 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComRom.h

Timestamp:

16 Jan 2014, 09:56:13 (10 years ago)

Author:

tech

Message:

Merged branch/9.2-dev0@722.

File:

• trunk/source/Lib/TLibCommon/TComRom.h (modified) (2 diffs)

trunk/source/Lib/TLibCommon/TComRom.h

@@ -172 +172 @@
 extern       std::vector< std::vector<TComWedgeRef> >        g_dmmWedgeRefLists;
 extern       std::vector< std::vector<TComWedgeNode> >       g_dmmWedgeNodeLists;
-#if !SEC_DMM3_RBC_F0147
-extern       std::vector< std::vector< std::vector<UInt> > > g_aauiWdgLstM3;
-#endif
 
 Void initWedgeLists( Bool initNodeList = false );
@@ -236 +233 @@
 
 
-#if H_MV_FIX_TRACE_FILE
  Void           writeToTraceFile( const Char* symbolName, Int val, Bool doIt );
  Void           writeToTraceFile( const Char* symbolName, Bool doIt );
-#else
- Void           writeToTraceFile( Char* symbolName, Int val, Bool doIt );
- Void           writeToTraceFile( Char* symbolName, Bool doIt );
-#endif
 #endif
 #else