[simuPOP-devel] SF.net SVN: simupop:[4971] trunk

[<bpe...@us...>]

Revision: 4971
          http://sourceforge.net/p/simupop/code/4971
Author:   bpeng2000
Date:     2015-04-23 19:28:13 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
Minor fixes

Modified Paths:
--------------
    trunk/development/conda/meta.yaml
    trunk/src/utility.cpp

Modified: trunk/development/conda/meta.yaml
===================================================================
--- trunk/development/conda/meta.yaml	2015-04-23 18:08:54 UTC (rev 4970)
+++ trunk/development/conda/meta.yaml	2015-04-23 19:28:13 UTC (rev 4971)
@@ -29,9 +29,11 @@
   build:
     - python
     - setuptools
+    - distribute
 
   run:
     - python
+    - setuptools
 
 test:
   # Python imports

Modified: trunk/src/utility.cpp
===================================================================
--- trunk/src/utility.cpp	2015-04-23 18:08:54 UTC (rev 4970)
+++ trunk/src/utility.cpp	2015-04-23 19:28:13 UTC (rev 4971)
@@ -1018,6 +1018,7 @@
 	// prevent reference decrease of circular reference caused by removing of
 	// temporary rhs objects
 	rhs.m_circular = false;
+	return *rhs;
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.