--- trunk/src/utils/ElementsTable.cpp	2008/10/16 18:17:41	1305
+++ trunk/src/utils/ElementsTable.cpp	2012/08/22 02:28:28	1782
@@ -1,7 +1,7 @@ This basic Periodic Table class was originally taken f
 /**********************************************************************
 
 This basic Periodic Table class was originally taken from the data.cpp
-file in OpenBabel. The code has been modified to match the OOPSE coding style.
+file in OpenBabel. The code has been modified to match the OpenMD coding style.
 
 We have retained the OpenBabel copyright and GPL license on this class:  
 
@@ -29,19 +29,22 @@ GNU General Public License for more details.
  * @version 1.0
  */
 
-#include <iostream>
 #include "config.h"
+
+#include <iostream>
 #include <cstdlib>
 #include <string>
 #include <fstream>
 #include <cstdlib>
 #include "utils/ElementsTable.hpp"
 #include "utils/simError.h"
-#include "io/basic_ifstrstream.hpp"
+#include "io/ifstrstream.hpp"
 
-#if !HAVE_STRNCASECMP
-extern "C" int strncasecmp(const char *s1, const char *s2, size_t n);
+#ifdef _MSC_VER
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
 #endif
+
 
 #ifdef WIN32
 #define FILE_SEP_CHAR "\\"
@@ -53,13 +56,13 @@ extern "C" int strncasecmp(const char *s1, const char 
 #define BUFF_SIZE 32768
 #endif
 
-namespace oopse {
+namespace OpenMD {
 
   ElementsTable etab;
 
   ElementsTable::ElementsTable() {
     init_ = false;
-    STR_DEFINE(dir_, FRC_PATH );
+    dir_ = std::string("TO_STRING(FRC_PATH)");
     envvar_ = "FORCE_PARAM_PATH";
     filename_ = "element.txt";
   }