Changeset 12497 for issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp

Timestamp:

06/21/12 14:08:16 (13 years ago)

Author:

Mathieu Morlighem

Message:

moved _error_ to _error2_ and added circular dependencies in Makefile.am to resolve all symbols

File:

• issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp (modified) (3 diffs)

issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp

@@ -31 +31 @@
         /*checks on arguments on the matlab side: */
         if(nlhs>NLHS){
-                KMLOverlayUsage(); _error_("KMLOverlay usage error");
+                KMLOverlayUsage(); _error2_("KMLOverlay usage error");
         }
         if(nrhs<NRHS){
-                KMLOverlayUsage(); _error_("KMLOverlay usage error");
+                KMLOverlayUsage(); _error2_("KMLOverlay usage error");
         }
 
@@ -51 +51 @@
 
         /*some checks*/
-        if (nlat !=2) _error_("Latitudinal axes \"lataxis\" require two double values, not %d.",nlat);
-        if (nlong!=2) _error_("Longitudinal axes \"longaxis\" require two double values, not %d.",nlong);
-        if (!nimages) _error_("No image files provided.");
+        if (nlat !=2) _error2_("Latitudinal axes \"lataxis\" require two double values, not " << nlat << ".");
+        if (nlong!=2) _error2_("Longitudinal axes \"longaxis\" require two double values, not " << nlong << ".");
+        if (!nimages) _error2_("No image files provided.");
 
         if ((int)dzip){
@@ -90 +90 @@
                 if (verbose) printf("%s\n",czip);
 
-                if (mexEvalString(czip)) _error_("Error zipping file \"%s\".",filkmz);
+                if (mexEvalString(czip)) _error2_("Error zipping file \"" << filkmz << "\".");
                 xfree((void**)&czip);
                 xfree((void**)&filkmz);