changes req'd for R

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8685 1feff8c3-07ed-0310-ac33-dd36852eb9cd

CSelectedOutput.cpp

@@ -14,7 +14,13 @@
 #include <string.h>                 // strlen
 
 #include "Debug.h"                  // ASSERT
+
+#if defined(R_SO) && defined(VAR_UNION_NAME)
+#include "CSelectedOutputhxx.h"     // CSelectedOutput
+#else
 #include "CSelectedOutput.hxx"      // CSelectedOutput
+#endif
+
 const float INACTIVE_CELL_VALUE = 1.0e30f;
 const size_t RESERVE_ROWS = 80;
 const size_t RESERVE_COLS = 80;

CVar.hxx

@@ -61,7 +61,7 @@ public:
 			Clear();
 			type = TT_DOUBLE;
 		}
-		dVal = dblSrc;
+		this->dVal = dblSrc;
 		return *this;
 	}
 	CVar& operator=(const char* pszSrc)

Var.h

@@ -12,6 +12,12 @@
 #define IPQ_DLL_EXPORT
 #endif
 
+#if defined(R_SO) || defined(NO_NAMELESS_UNION)
+#define VAR_UNION_NAME u
+#else
+#define VAR_UNION_NAME
+#endif
+
 /*! \brief Enumeration used to determine the type of data stored in a VAR.
 */
 typedef enum {
@@ -42,7 +48,7 @@ typedef struct {
 		double  dVal;      /*!< valid when <code>(type == TT_DOUBLE)</code> */
 		char*   sVal;      /*!< valid when <code>(type == TT_STRING)</code> */
 		VRESULT vresult;   /*!< valid when <code>(type == TT_ERROR)</code>  */
-	};
+	} VAR_UNION_NAME;
 } VAR;