[Nsclspectcl-cvscommits] SF.net SVN: nsclspectcl:[1675] branches/SpecTcl-3.2-maintenance/SpecTcl/ IntegrateCommand.cpp

[<ro...@us...>]

Revision: 1675
          http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1675&view=rev
Author:   ron-fox
Date:     2010-05-14 18:33:28 +0000 (Fri, 14 May 2010)

Log Message:
-----------
Remove -lpub dependencies completely.

Modified Paths:
--------------
    branches/SpecTcl-3.2-maintenance/SpecTcl/IntegrateCommand.cpp

Modified: branches/SpecTcl-3.2-maintenance/SpecTcl/IntegrateCommand.cpp
===================================================================
--- branches/SpecTcl-3.2-maintenance/SpecTcl/IntegrateCommand.cpp	2010-05-14 18:18:52 UTC (rev 1674)
+++ branches/SpecTcl-3.2-maintenance/SpecTcl/IntegrateCommand.cpp	2010-05-14 18:33:28 UTC (rev 1675)
@@ -34,8 +34,11 @@
 
 // this is in publib but nowadays its header can conflict with string:
 
-extern "C" {
-  void memswap(void* block1, void* block2, size_t n);
+static inline void dblswap(double &d1, double& d2)
+{
+  double t = d1;
+  d1       = d2;
+  d2       = d1;
 }
 
 static const double fwhmgamma(2.354); // sigma*fwhmgamma = fwhm for gaussians.
@@ -403,7 +406,7 @@
     double low = list[0];
     double hi  = list[1];
 
-    if (low > hi) memswap(&hi, &low, sizeof(double));
+    if (low > hi) dblswap(hi, low);
 
     // Fill result now:
 


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