Merge pull request #50 from BlackEdder/imports

Support new compiler
BlackEdder · Jan 21, 2016 · c9ea3dd · c9ea3dd
2 parents 60b81bc + 0513ab7
commit c9ea3dd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,5 +8,6 @@ matrix:
     - secure: F1pwSI3BTHI/W0vaUNr2HeS7+25jLJiH2CF9pTW7cySKJGJkyOJ6gJkv71HYxq/cYVda8Y7qy+a//lZFQeWlEmMW4FTblXTE0qVvUzfCw3VRKLGYIMMMi2JzyWJODH+8Q2m19mS9OneZR5zL2NmopJn6wGrfUWZZuerk3XP57C0=
   - d: dmd-2.067.1
   - d: dmd-2.068.0
+  - d: dmd
   - d: ldc-0.15.1
   - d: gdc-4.9.2
diff --git a/dub.json b/dub.json
@@ -7,7 +7,7 @@
     "license": "BSL-1.0",
     "dependencies": {
         "dunit": "~>1.0.10",
-        "painlesstraits": "~>0.0.1"
+        "painlesstraits": "~>0.1.0"
     },
     "configurations": [
         {

diff --git a/source/painlessjson/painlessjson.d b/source/painlessjson/painlessjson.d
@@ -6,7 +6,8 @@ import std.conv;
 import std.json;
 import std.range;
 import std.traits;
-import std.typecons : TypeTuple, Tuple;
+import std.typecons : Tuple;
+import std.typetuple : TypeTuple;
 import painlessjson.annotations;
 import painlessjson.string;
 import painlesstraits;
@@ -591,15 +592,13 @@ template hasAccessibleConstructor(T)
         if (__traits(hasMember, T, "__ctor"))
         {
             alias Overloads = TypeTuple!(__traits(getOverloads, T, "__ctor"));
+            bool anyInstanciates = false;
             foreach (overload; Overloads)
             {
-                if (__traits(compiles, getInstanceFromCustomConstructor!(T,
-                        overload, false)(JSONValue())))
-                {
-                    return true;
-                }
+                anyInstanciates |= __traits(compiles, getInstanceFromCustomConstructor!(T,
+                        overload, false)(JSONValue()));
             }
-            return false;
+            return anyInstanciates;
         }
     }