Merge pull request #1600 from RazvanN7/fix

Fork: 0

johnpearcey / dub_jkp

Browse code Merge pull request #1600 from RazvanN7/fix_cast Fix wrong cast merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com> master
1 parent 3021f4c commit cdbc32735a16da23efdd6dd6aea13b9e0e225b09 The Dlang Bot authored on 27 Nov 2018 Sebastian Wilzbach committed on 28 Nov 2018

Patch

Unified Split

Showing 1 changed file

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          source/dub/generators/generator.d
-	private static void mergeFromDependent(in ref BuildSettings parent, ref BuildSettings child)
	{
		child.addVersions(parent.versions);
		child.addDebugVersions(parent.debugVersions);
		child.addOptions(BuildOptions(cast(BuildOptions)parent.options & inheritedBuildOptions));
		child.addOptions(BuildOptions(parent.options & inheritedBuildOptions));
	}
 
	private static void mergeFromDependency(in ref BuildSettings child, ref BuildSettings parent)
	{
 	private static void mergeFromDependent(in ref BuildSettings parent, ref BuildSettings child)
 	{
 		child.addVersions(parent.versions);
 		child.addDebugVersions(parent.debugVersions);
+		child.addOptions(BuildOptions(cast(BuildOptions)parent.options & inheritedBuildOptions));
+		child.addOptions(BuildOptions(parent.options & inheritedBuildOptions));
 	}
 	private static void mergeFromDependency(in ref BuildSettings child, ref BuildSettings parent)
 	{

Show line notes below