mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-29 10:18:30 +00:00
9fa9eb9ac7
Rename them to follow the make makepatch naming, and regenerate them. With hat: portmgr Sponsored by: Absolight
54 lines
1.3 KiB
C++
54 lines
1.3 KiB
C++
--- cfheader.cpp.orig 1999-10-24 06:13:29 UTC
|
|
+++ cfheader.cpp
|
|
@@ -18,17 +18,23 @@
|
|
#define __CFHEADER_CPP__
|
|
|
|
#include <string.h>
|
|
-#include <fstream.h>
|
|
+#include <fstream>
|
|
#include "bstring.h"
|
|
#include "cftypes.h"
|
|
#include "cfheader.h"
|
|
|
|
#ifdef unix
|
|
-#include <strstream.h>
|
|
+#include <strstream>
|
|
#else
|
|
#include <strstrea.h>
|
|
#endif
|
|
|
|
+using std::ios;
|
|
+using std::ifstream;
|
|
+using std::ofstream;
|
|
+using std::ostrstream;
|
|
+using std::ends;
|
|
+
|
|
////////////////////////////////////////****************************************
|
|
|
|
// Initializes a valid fixed cabinet header
|
|
@@ -127,7 +133,7 @@ Error cabinet_header::read(istream& in)
|
|
{
|
|
reserved_area = new byte[cabinet_ra_size];
|
|
|
|
- if(in.read(reserved_area, cabinet_ra_size).bad())
|
|
+ if(in.read((char*)reserved_area, cabinet_ra_size).bad())
|
|
{
|
|
return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
|
|
}
|
|
@@ -172,7 +178,7 @@ Error cabinet_header::write(ostream& out
|
|
|
|
if(cabinet_ra_size > 0) // If has cabinet reserved area
|
|
{
|
|
- if(out.write(reserved_area, cabinet_ra_size).fail())
|
|
+ if(out.write((char*)reserved_area, cabinet_ra_size).fail())
|
|
{
|
|
return WRITE_ERROR;
|
|
}
|
|
@@ -210,4 +216,4 @@ Error cabinet_header::write(ostream& out
|
|
|
|
////////////////////////////////////////****************************************
|
|
|
|
-#endif
|
|
\ No newline at end of file
|
|
+#endif
|