ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/utils/ElementsTable.cpp

Comparing:
trunk/src/utils/ElementsTable.cpp (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/utils/ElementsTable.cpp (file contents), Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

#	Line 29 | Line 29 | GNU General Public License for more details.
29		* @version 1.0
30		*/
31
32	–	#include <iostream>
32		#include "config.h"
33	+
34	+	#include <iostream>
35		#include <cstdlib>
36		#include <string>
37		#include <fstream>
38		#include <cstdlib>
39		#include "utils/ElementsTable.hpp"
40		#include "utils/simError.h"
41	<	#include "io/basic_ifstrstream.hpp"
41	>	#include "io/ifstrstream.hpp"
42
43	<	#if !HAVE_STRNCASECMP
44	<	extern "C" int strncasecmp(const char *s1, const char *s2, size_t n);
43	>	#ifdef _MSC_VER
44	>	#define strncasecmp _strnicmp
45	>	#define strcasecmp _stricmp
46		#endif
47
48	+
49		#ifdef WIN32
50		#define FILE_SEP_CHAR "\\"
51		#else
#	Line 59 | Line 62 | namespace OpenMD {
62
63		ElementsTable::ElementsTable() {
64		init_ = false;
65	<	STR_DEFINE(dir_, FRC_PATH );
65	>	dir_ = std::string("TO_STRING(FRC_PATH)");
66		envvar_ = "FORCE_PARAM_PATH";
67		filename_ = "element.txt";
68		}

Comparing:
trunk/src/utils/ElementsTable.cpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/utils/ElementsTable.cpp (property svn:keywords), Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

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

Diff Legend

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