ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/utils/ElementsTable.cpp
(Generate patch)

Comparing:
trunk/src/utils/ElementsTable.cpp (file contents), Revision 1305 by skuang, Thu Oct 16 18:17:41 2008 UTC vs.
branches/development/src/utils/ElementsTable.cpp (file contents), Revision 1808 by gezelter, Mon Oct 22 20:42:10 2012 UTC

# Line 1 | Line 1 | This basic Periodic Table class was originally taken f
1   /**********************************************************************
2  
3   This basic Periodic Table class was originally taken from the data.cpp
4 < file in OpenBabel. The code has been modified to match the OOPSE coding style.
4 > file in OpenBabel. The code has been modified to match the OpenMD coding style.
5  
6   We have retained the OpenBabel copyright and GPL license on this class:  
7  
# Line 25 | Line 25 | GNU General Public License for more details.
25   * @file ElementsTable.cpp
26   * @author gezelter
27   * @date 12/21/2007
28 – * @time 11:30am
28   * @version 1.0
29   */
30  
32 – #include <iostream>
31   #include "config.h"
32 +
33 + #include <iostream>
34   #include <cstdlib>
35   #include <string>
36   #include <fstream>
37   #include <cstdlib>
38   #include "utils/ElementsTable.hpp"
39   #include "utils/simError.h"
40 < #include "io/basic_ifstrstream.hpp"
41 <
42 < #if !HAVE_STRNCASECMP
43 < extern "C" int strncasecmp(const char *s1, const char *s2, size_t n);
40 > #include "io/ifstrstream.hpp"
41 >
42 > #ifdef _MSC_VER
43 > #define strncasecmp _strnicmp
44 > #define strcasecmp _stricmp
45   #endif
46  
47 +
48   #ifdef WIN32
49   #define FILE_SEP_CHAR "\\"
50   #else
# Line 53 | Line 55 | extern "C" int strncasecmp(const char *s1, const char
55   #define BUFF_SIZE 32768
56   #endif
57  
58 < namespace oopse {
58 > namespace OpenMD {
59  
60    ElementsTable etab;
61  
62    ElementsTable::ElementsTable() {
63      init_ = false;
64 <    STR_DEFINE(dir_, FRC_PATH );
64 >    dir_ = std::string("TO_STRING(FRC_PATH)");
65      envvar_ = "FORCE_PARAM_PATH";
66      filename_ = "element.txt";
67    }

Comparing:
trunk/src/utils/ElementsTable.cpp (property svn:keywords), Revision 1305 by skuang, Thu Oct 16 18:17:41 2008 UTC vs.
branches/development/src/utils/ElementsTable.cpp (property svn:keywords), Revision 1808 by gezelter, Mon Oct 22 20:42:10 2012 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines