diff options
| author | lloyd <[email protected]> | 2010-07-09 20:31:56 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-07-09 20:31:56 +0000 |
| commit | e366bebf7a6cd85668ccd173e0f279dc80a246aa (patch) | |
| tree | 3ee72d57bcb82fdace1ec0fee6ef48d6d6ff09f5 | |
| parent | 91137b44613c7ed5a12a1c64a6fd3e119828c43c (diff) | |
Post merge fixups
| -rw-r--r-- | src/build-data/cc/gcc.txt | 2 | ||||
| -rw-r--r-- | src/build-data/cc/icc.txt | 2 | ||||
| -rw-r--r-- | src/libstate/libstate.cpp | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 1d5038090..85000098d 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -2,8 +2,6 @@ macro_name GCC binary_name g++-4.5.0 -has_tr1 yes - compile_option "-c " output_to_option "-o " add_include_dir_option -I diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt index b122d4798..1aab4d111 100644 --- a/src/build-data/cc/icc.txt +++ b/src/build-data/cc/icc.txt @@ -2,8 +2,6 @@ macro_name INTEL binary_name icpc -has_tr1 yes - compile_option "-c " output_to_option "-o " add_include_dir_option -I diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp index 6e19f9c59..1522879f7 100644 --- a/src/libstate/libstate.cpp +++ b/src/libstate/libstate.cpp @@ -66,7 +66,7 @@ Library_State& global_state() if(!global_lib_state) { global_lib_state = new Library_State; - global_lib_state->initialize(true); + global_lib_state->initialize(); } return (*global_lib_state); |