Skip to content

Instantly share code, notes, and snippets.

@Kocha
Created February 8, 2013 15:19
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Kocha/4739646 to your computer and use it in GitHub Desktop.
Save Kocha/4739646 to your computer and use it in GitHub Desktop.
SystemC Verification Library install at gcc4.4.0 (32bit) patch.
--- a/configure
+++ configure
@@ -5637,37 +5637,38 @@ EOF
/* So define it here empty. Namespaces are extensible, so this is harmless. */
namespace std {}
using namespace std;
-#include <string>
-#include <stdio.h>
-#include <strstream.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
+#include <sstream>
int main()
{
#define STRING_SIZE 100
char buf[STRING_SIZE];
int i = 1;
- sprintf(buf, "hello world %i", i);
- if (strcmp(buf,"hello world 1") != 0)
+ std::sprintf(buf, "hello world %i", i);
+ if (std::strcmp(buf,"hello world 1") != 0)
{
- exit(1);
+ std::exit(1);
}
- ostrstream outString(buf, STRING_SIZE);
+ std::ostringstream outString;
outString << "hello world " << i;
- if (strcmp(buf,"hello world 1") != 0)
+ if (std::strcmp(buf,"hello world 1") != 0)
{
- exit(1);
+ std::exit(1);
}
- string str = "hello world";
+ std::string str = "hello world";
str = str + " 1";
if (str != "hello world 1")
{
- exit(1);
+ std::exit(1);
}
//
// OK!
//
- exit(0);
+ std::exit(0);
}
EOF
if eval ./test.sh; then
@@ -5715,13 +5716,13 @@ EOF
/* So define it here empty. Namespaces are extensible, so this is harmless. */
namespace std {}
using namespace std;
-#include <stdlib.h>
-#include <iostream.h>
+#include <cstdlib>
+#include <iostream>
int main()
{
unsigned long long hold = 10;
- cout << hold << endl;
- exit(0);
+ std::cout << hold << std::endl;
+ std::exit(0);
}
EOF
if eval ./test.sh; then
@@ -5768,10 +5769,10 @@ struct testT { const char* name; int i; int j; };
testT test[] = {{"test0",5,2},{"test1",3,3},{0}};
EOF
cat > t2conftest.cc <<EOF
-#include <iostream.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <iostream>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
struct testT { const char* name; int i; int j;};
static testT (*testP)[];
extern testT test[];
@@ -5780,12 +5781,12 @@ int main() {
static char str[10];
int i=0, failed=0;
while((*testP)[i].name){
- sprintf(str, "test%d",i);
- if(strcmp(str, (*testP)[i].name) != 0) ++failed;
+ std::sprintf(str, "test%d",i);
+ if(std::strcmp(str, (*testP)[i].name) != 0) ++failed;
i++;
}
if(failed) { exit (1); }
- exit (0);
+ std::exit (0);
}
EOF
if eval ./test.sh; then
--- a/examples/data_structures/scv_bag/Makefile
+++ examples/data_structures/scv_bag/Makefile
@@ -6,4 +6,4 @@ TOPDIR=../..
SOURCE_FILES=test.cc
-include ${TOPDIR}/Makefile.rules.in
+include ${TOPDIR}/Makefile.rules
--- a/src/scv/scv_constraint.h
+++ src/scv/scv_constraint.h
@@ -84,6 +84,7 @@ typedef DdNode ddNodeT;
// Forward declarations
class _scv_constraint_manager;
class _scv_expr;
+void _scv_pop_constraint();
#define MAX_MESSAGE_SIZE 1024
#define SIZE_HINT 100000
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment