Skip to content

Commit

Permalink
fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
9rnsr committed Nov 1, 2015
1 parent 05f128a commit 59989ed
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion std/experimental/logger/core.d
Original file line number Diff line number Diff line change
Expand Up @@ -2100,7 +2100,7 @@ unittest // default logger
unittest
{
import std.file : deleteme, remove;
import core.memory : destroy;

string filename = deleteme ~ __FUNCTION__ ~ ".tempLogFile";
auto oldunspecificLogger = sharedLog;

Expand Down
6 changes: 4 additions & 2 deletions std/socket.d
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ import core.stdc.stdint, core.stdc.string, std.string, core.stdc.stdlib, std.con

import core.stdc.config;
import core.time : dur, Duration;
import std.algorithm : max;
import std.exception : assumeUnique, enforce, collectException;

import std.internal.cstring;
Expand All @@ -63,7 +62,8 @@ version(Windows)
pragma (lib, "ws2_32.lib");
pragma (lib, "wsock32.lib");

private import core.sys.windows.windows, core.sys.windows.winsock2, std.windows.syserror;
public import core.sys.windows.winsock2;
private import core.sys.windows.windows, std.windows.syserror;
private alias _ctimeval = core.sys.windows.winsock2.timeval;
private alias _clinger = core.sys.windows.winsock2.linger;

Expand Down Expand Up @@ -3247,6 +3247,8 @@ public:

version (Windows)
{
import std.algorithm.comparison : max;

auto msecs = to!int(value.total!"msecs");
if (msecs != 0 && option == SocketOption.RCVTIMEO)
msecs = max(1, msecs - WINSOCK_TIMEOUT_SKEW);
Expand Down
2 changes: 1 addition & 1 deletion std/stdio.d
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ $(D rawRead) always reads in binary mode on Windows.
*/
T[] rawRead(T)(T[] buffer)
{
import std.exception : Exception, errnoEnforce;
import std.exception : errnoEnforce;

if (!buffer.length)
throw new Exception("rawRead must take a non-empty buffer");
Expand Down
2 changes: 1 addition & 1 deletion std/utf.d
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,7 @@ dchar decodeFront(UseReplacementDchar useReplacementDchar = UseReplacementDchar.
}

// Gives the maximum value that a code unit for the given range type can hold.
private template codeUnitLimit(S)
package template codeUnitLimit(S)
if (isSomeChar!(ElementEncodingType!S))
{
static if (is(Unqual!(ElementEncodingType!S) == char))
Expand Down

0 comments on commit 59989ed

Please sign in to comment.