casa-mp-base

--- common/video/iso-mpeg4/include/bitstrm.hpp

+++ common/video/iso-mpeg4/include/bitstrm.hpp

@@ -45,8 +45,8 @@

 #ifndef _BITSTREAM_HPP_

 #define _BITSTREAM_HPP_

 #include "inbits.h"

-#include <istream.h>

-#include <ostream.h>

+#include <istream>

+#include <ostream>

 class CIOBitStream

 {

--- common/video/iso-mpeg4/include/entropy.hpp

+++ common/video/iso-mpeg4/include/entropy.hpp

@@ -39,8 +39,10 @@

 #ifndef __ENTROPY_HPP_

 #define __ENTROPY_HPP_

-#include <istream.h>

-#include <ostream.h>

+#include <istream>

+#include <ostream>

+

+using namespace std;

 class CInBitStream;

 class COutBitStream;

--- common/video/iso-mpeg4/include/vopseenc.hpp

+++ common/video/iso-mpeg4/include/vopseenc.hpp

@@ -79,6 +79,8 @@

 #include "tm5rc.hpp"

+using namespace std;

+

 class CFwdBlockDCT;

 // HHI Schueuer:  scan selection classes to support the sadct

--- common/video/iso-mpeg4/src/app_encoder_encoder.cpp

+++ common/video/iso-mpeg4/src/app_encoder_encoder.cpp

@@ -99,7 +99,7 @@

 #include "mode.hpp"

 #include "tm5rc.hpp"

-#include "fstream.h"

+#include "fstream"

 #include "sesenc.hpp"

 // #include "encoder/tps_sesenc.hpp" // deleted by Sharp (98/2/12)

--- common/video/iso-mpeg4/src/sys_encoder_errenc.cpp

+++ common/video/iso-mpeg4/src/sys_encoder_errenc.cpp

@@ -54,7 +54,7 @@

 #include <stdio.h>

 #include <math.h>

 #include <stdlib.h>

-#include <iostream.h>

+#include <iostream>

 #include "typeapi.h"

 #include "codehead.h"

--- common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp

+++ common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp