fixing compiler errors

ernstae · May 7, 2012 · f66cbbf · f66cbbf
1 parent 78e3148
commit f66cbbf
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/r2/spk/aspk/spkcompiler/doc/Makefile.am b/r2/spk/aspk/spkcompiler/doc/Makefile.am
@@ -1,4 +1,4 @@
-include ../../../../doc/webdir.mk
+WEBDIR=.
 T = spkcompiler
 WEB = $(WEBDIR)/v0.1/specs/$T
 

diff --git a/r2/spk/aspk/spkcompiler/spkcompiler/SpkCompilerException.cpp b/r2/spk/aspk/spkcompiler/spkcompiler/SpkCompilerException.cpp
@@ -11,6 +11,8 @@
 #include <sstream>
 #include <cassert>
 #include <stdio.h>
+#include <stdlib.h>
+#include <cstring>
 
 #include "SpkCompilerException.h"
 

diff --git a/r2/spk/aspk/spkcompiler/spkcompiler/client.h b/r2/spk/aspk/spkcompiler/spkcompiler/client.h
@@ -2,6 +2,7 @@
 #define CLIENT_H
 
 #include <string>
+#include <cstring>
 /**
  * @file client.h
  * Define "client" namespace. 

diff --git a/r2/spk/aspk/spkcompiler/tests/common/SpkCompilerErrorTest.cpp b/r2/spk/aspk/spkcompiler/tests/common/SpkCompilerErrorTest.cpp
@@ -33,6 +33,8 @@
 #include <fstream>
 #include <sstream>
 #include <new>
+#include <stdio.h>
+#include <cstring>
 
 #include <cppunit/TestSuite.h>
 #include <cppunit/TestCaller.h>

diff --git a/r2/spk/aspk/spkcompiler/tests/nonmem/lex_explangTest.cpp b/r2/spk/aspk/spkcompiler/tests/nonmem/lex_explangTest.cpp
@@ -2,6 +2,7 @@
 #include <valarray>
 #include <fstream>
 #include <string>
+#include <cstring>
 
 #include "lex_explangTest.h"
 

diff --git a/r2/spk/aspk/spkcompiler/tests/nonmem/pop_subprobTest.cpp b/r2/spk/aspk/spkcompiler/tests/nonmem/pop_subprobTest.cpp
@@ -691,9 +691,9 @@ void pop_subprobTest::testReportML()
   in.close();
   std::string allStr = all.str();
   const char* str = allStr.c_str();
-  char* c1 = strstr( str, "<?xml" );
-  char* c2 = strstr( c1+5,  "<?xml" );
-  char* c3 = strstr( c2+5,  "<?xml" );
+  const char* c1 = strstr( str, "<?xml" );
+  const char* c2 = strstr( c1+5,  "<?xml" );
+  const char* c3 = strstr( c2+5,  "<?xml" );
 
   FILE * xml1 = fopen( "xml1.xml", "w" );
   fprintf( xml1, "%s\n", c1 );