* Replaced kernel_cpp.h with util/kernel_cpp.h

* Removed Udf namespace
* Minor clean up


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27027 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Salvatore Benedetto 2008-08-18 10:13:57 +00:00
parent 375d5b5d0c
commit c49d6efc60
9 changed files with 9 additions and 25 deletions

View File

@ -8,12 +8,11 @@
#ifndef _UDF_ARRAY_H
#define _UDF_ARRAY_H
#include "kernel_cpp.h"
#include "SupportDefs.h"
#include "UdfDebug.h"
namespace Udf {
#include <util/kernel_cpp.h>
/*! \brief Slightly more typesafe static array type than built-in arrays,
with array length information stored implicitly (i.e. consuming no
@ -87,7 +86,4 @@ struct array<char, arrayLength> {
uint8 data[arrayLength];
};
}; // namespace UDF
#endif // _UDF_ARRAY_H

View File

@ -10,9 +10,7 @@
#include <malloc.h>
#include "kernel_cpp.h"
namespace Udf {
#include <util/kernel_cpp.h>
/*! Simple class to encapsulate the boring details of allocating
and deallocating a chunk of memory.
@ -67,6 +65,4 @@ private:
uint8 fData[size];
};
}; // namespace Udf
#endif // _UDF_MEMORY_CHUNK_H

View File

@ -10,13 +10,11 @@
/*! \file MetadataPartition.h
*/
#include <kernel_cpp.h>
#include <util/kernel_cpp.h>
#include "Partition.h"
#include "UdfDebug.h"
namespace Udf {
/*! \brief Type 2 metadata partition
Metadata partitions allow for clustering of metadata (ICBs, directory
@ -46,6 +44,4 @@ private:
status_t fInitStatus;
};
}; // namespace Udf
#endif // _UDF_METADATA_PARTITION_H

View File

@ -2,7 +2,6 @@
#define B_NOT_IMPLEMENTED B_ERROR
using namespace Udf;
/*! \brief Creates a new PhysicalPartition object.
*/

View File

@ -2,7 +2,6 @@
#define B_NOT_IMPLEMENTED B_ERROR
using namespace Udf;
/*! \brief Creates a new SparablePartition object.
*/

View File

@ -14,6 +14,7 @@
#include "UdfDebug.h"
#include <stdlib.h>
#include <string.h>
#include <KernelExport.h>
#include <TLS.h>

View File

@ -47,7 +47,7 @@ extern "C" int vsprintf(char *s, const char *format, va_list arg);
//# define __out printf
#endif
#include "kernel_cpp.h"
#include <util/kernel_cpp.h>
class DebugHelper;
@ -230,6 +230,7 @@ private:
#endif // ifdef DEBUG else
#define TRACE(x) DBG(dprintf x)
#define TRACE_ERROR(x) DBG(dprintf x)
// These macros turn on or off extensive and generally unnecessary
// debugging output regarding table of contents parsing

View File

@ -12,11 +12,12 @@
#include <ByteOrder.h>
#include <SupportDefs.h>
#include "kernel_cpp.h"
#include "UdfDebug.h"
#include "Array.h"
#include <util/kernel_cpp.h>
/*! \file UdfStructures.h
\brief UDF on-disk data structure declarations
@ -42,8 +43,6 @@
- <a href='http://www.hi-ho.ne.jp/y-komachi/committees/fpro/fpro.htm'>Possible test disc image generator (?)</a>
*/
namespace Udf {
//----------------------------------------------------------------------
// ECMA-167 Part 1
//----------------------------------------------------------------------
@ -615,7 +614,7 @@ public:
// crc_length, based off provided descriptor
set_crc_length(size - sizeof(descriptor_tag));
// crc
uint16 crc = Udf::calculate_crc(reinterpret_cast<uint8*>(this)
uint16 crc = calculate_crc(reinterpret_cast<uint8*>(this)
+ sizeof(descriptor_tag), crc_length());
set_crc(crc);
// checksum (which depends on the other two values)
@ -2198,7 +2197,5 @@ private:
};
}; // namespace Udf
#endif // _UDF_DISK_STRUCTURES_H

View File

@ -2,7 +2,6 @@
#define B_NOT_IMPLEMENTED B_ERROR
using namespace Udf;
/*! \brief Creates a new VirtualPartition object.