Issue 6572 - Deprecate typedef

Remove use of deprecated typedef from phobos.  This mostly consists of changing typedef to alias, and disabling unittests that require typedef.  One change to std.registry is needed to work around a bug in typedef (6571).
This commit is contained in:
Daniel Murphy 2011-08-30 13:22:10 +10:00
parent 2297b0e2f5
commit 1590a5cc38
10 changed files with 31 additions and 31 deletions

View file

@ -1076,7 +1076,7 @@ int uncompress(ubyte* dest,
*/
typedef void* gzFile;
alias void* gzFile;
alias int z_off_t; // file offset
gzFile gzopen(char* path, char* mode);

View file

@ -929,7 +929,7 @@ T toImpl(T, S)(S s, in T left = S.stringof~"(", in T right = ")")
}
}
unittest
version(none) unittest
{
debug(conv) scope(success) writeln("unittest @",
__FILE__, ":", __LINE__, " succeeded.");
@ -2700,7 +2700,7 @@ Target parse(Target, Source)(ref Source s, dchar lbracket = '[', dchar rbracket
return result;
}
unittest
version(none) unittest
{
debug(conv) scope(success) writeln("unittest @", __FILE__, ":", __LINE__, " succeeded.");
typedef uint Testing;

View file

@ -1091,7 +1091,7 @@ version (Posix)
/***
* Type representing the DOS file date/time format.
*/
typedef uint DosFileTime;
alias uint DosFileTime;
/************************************
* Convert from DOS file date/time to d_time.

View file

@ -31542,7 +31542,7 @@ else version(Windows)
/++
Type representing the DOS file date/time format.
+/
typedef uint DosFileTime;
alias uint DosFileTime;
/++
Converts from DOS file date/time to $(D SysTime).

View file

@ -656,7 +656,7 @@ template EncoderInstance(E)
//=============================================================================
/** Defines various character sets. */
typedef ubyte AsciiChar;
enum AsciiChar : ubyte { init };
/// Ditto
alias immutable(AsciiChar)[] AsciiString;
@ -736,7 +736,7 @@ template EncoderInstance(CharType : AsciiChar)
//=============================================================================
/** Defines an Latin1-encoded character. */
typedef ubyte Latin1Char;
enum Latin1Char : ubyte { init };
/**
Defines an Latin1-encoded string (as an array of $(D
immutable(Latin1Char))).
@ -812,7 +812,7 @@ template EncoderInstance(CharType : Latin1Char)
//=============================================================================
/** Defines a Windows1252-encoded character. */
typedef ubyte Windows1252Char;
enum Windows1252Char : ubyte { init };
/**
Defines an Windows1252-encoded string (as an array of $(D
immutable(Windows1252Char))).

View file

@ -3849,10 +3849,10 @@ unittest
r = std.string.format("%.*d", -3, 7);
assert(r == "7");
typedef int myint;
myint m = -7;
r = std.string.format(m);
assert(r == "-7");
//typedef int myint;
//myint m = -7;
//r = std.string.format(m);
//assert(r == "-7");
r = std.string.format("abc"c);
assert(r == "abc");

View file

@ -95,7 +95,7 @@ else
* can result in the same module being loaded, which cannot be detected in
* some operating systems
*/
typedef void *HXModule;
alias void *HXModule;
/* /////////////////////////////////////////////////////////////////////////////
* ExeModule functions

View file

@ -63,7 +63,7 @@ version(Win32)
private import std.c.windows.windows, std.c.windows.winsock;
private alias std.c.windows.winsock.timeval _ctimeval;
typedef SOCKET socket_t = INVALID_SOCKET;
enum socket_t : SOCKET { INVALID_SOCKET };
private const int _SOCKET_ERROR = SOCKET_ERROR;

View file

@ -1106,8 +1106,8 @@ unittest
static assert(!hasRawAliasing!(S6));
union S7 { int a; int * b; }
static assert(hasRawAliasing!(S7));
typedef int* S8;
static assert(hasRawAliasing!(S8));
//typedef int* S8;
//static assert(hasRawAliasing!(S8));
enum S9 { a };
static assert(!hasRawAliasing!(S9));
// indirect members
@ -1190,10 +1190,10 @@ unittest
static assert(hasRawUnsharedAliasing!(S9));
union S10 { int a; shared int * b; }
static assert(!hasRawUnsharedAliasing!(S10));
typedef int* S11;
static assert(hasRawUnsharedAliasing!(S11));
typedef shared int* S12;
static assert(hasRawUnsharedAliasing!(S12));
//typedef int* S11;
//static assert(hasRawUnsharedAliasing!(S11));
//typedef shared int* S12;
//static assert(hasRawUnsharedAliasing!(S12));
enum S13 { a };
static assert(!hasRawUnsharedAliasing!(S13));
// indirect members
@ -3319,18 +3319,18 @@ private template OriginalTypeImpl(T)
unittest
{
typedef real T;
typedef T U;
enum V : U { a }
static assert(is(OriginalType!T == real));
static assert(is(OriginalType!U == real));
static assert(is(OriginalType!V == real));
//typedef real T;
//typedef T U;
//enum V : U { a }
//static assert(is(OriginalType!T == real));
//static assert(is(OriginalType!U == real));
//static assert(is(OriginalType!V == real));
enum E : real { a }
enum F : E { a = E.a }
typedef const F G;
//typedef const F G;
static assert(is(OriginalType!E == real));
static assert(is(OriginalType!F == real));
static assert(is(OriginalType!G == const real));
//static assert(is(OriginalType!G == const real));
}
@ -3551,8 +3551,8 @@ private string removeDummyEnvelope(string s)
unittest
{
typedef int MyInt;
MyInt test() { return 0; }
//typedef int MyInt;
//MyInt test() { return 0; }
class C { int value() @property { return 0; } }
static assert(mangledName!(int) == int.mangleof);
static assert(mangledName!(C) == C.mangleof);

View file

@ -114,7 +114,7 @@ public enum Endian
/+ + These are borrowed from synsoft.win32.types for the moment, but will not be
+ needed once I've convinced Walter to use strong typedefs for things like HKEY +
+/
private typedef uint Reserved;
private alias uint Reserved;
//import synsoft.text.token;
/+ ++++++ This is borrowed from synsoft.text.token, until such time as something