Commit af3e59e8 by Francois Gygi

Introduced USE_UUID macro


git-svn-id: http://qboxcode.org/svn/qb/trunk@846 cba15fb0-1239-40c8-b417-11db7ca47a34
parent ad03bfb3
......@@ -3,6 +3,10 @@ LineMinimizer.h: avoid getting blocked in bracketing mode
indefinitely when the accuracy of forces is insufficient.
Sample.h: replace ExtForceSet and ConstraintSet members by pointers.
--------------------------------------------------------------------------------
rel1_52_4
Introduced a USE_UUID macro in qb.C, uuid_str.[Ch] (some platforms have no
uuid library)
--------------------------------------------------------------------------------
rel1_52_3
Fixed StructuredDocumentHandler.[Ch] and WavefunctionHandler.C for compilation
with Xerces-C 3.x.x
......
......@@ -35,7 +35,9 @@ using namespace std;
#include "isodate.h"
#include "release.h"
#include "qbox_xmlns.h"
#if USE_UUID
#include "uuid_str.h"
#endif
#include "Context.h"
#include "UserInterface.h"
......@@ -136,7 +138,9 @@ int main(int argc, char **argv, char **envp)
{
cout << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
cout << "<fpmd:simulation xmlns:fpmd=\"" << qbox_xmlns() << "\">" << endl;
#if USE_UUID
cout << "<uuid> " << uuid_str() << " </uuid>" << endl;
#endif
cout << "\n";
cout << " ============================\n";
cout << " I qbox "
......
#if USE_UUID
#include <uuid/uuid.h>
#include "uuid_str.h"
using namespace std;
......@@ -15,3 +16,4 @@ std::string uuid_str(void)
return string(s);
}
#endif
#include <string>
#if USE_UUID
std::string uuid_str(void);
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment