Skip to content
Browse files

pat clang 3.2svn on the head

mark a few private variables as __attribute__((unused)) to compile with -Werror and the apparently new -Wunused-private-field
fix a logic error in bert where it was negating a boolean and comparing that to an enum rather than comparing against the enum and negating the result of the comparison
  • Loading branch information...
1 parent 75596a4 commit c943f9174d78bf1b7cfd14c8439da0c42cfe914f @ttilley committed
Showing with 6 additions and 6 deletions.
  1. +1 −1 vm/agent_components.cpp
  2. +1 −1 vm/agent_components.hpp
  3. +2 −2 vm/llvm/jit_visit.hpp
  4. +1 −1 vm/type_info.hpp
  5. +1 −1 vm/util/bert.hpp
View
2 vm/agent_components.cpp
@@ -357,7 +357,7 @@ namespace agent {
class ThreadCount : public DynamicVariable {
SharedState& shared_;
- State* state_;
+ State* state_ __attribute__((unused));
public:
ThreadCount(State* state, SharedState& ss, const char* name)
View
2 vm/agent_components.hpp
@@ -13,7 +13,7 @@ namespace agent {
class Tree;
class Output {
- bert::IOWriter& writer_;
+ bert::IOWriter& writer_ __attribute__((unused));
bert::Encoder<bert::IOWriter> encoder_;
public:
View
4 vm/llvm/jit_visit.hpp
@@ -80,8 +80,8 @@ namespace rubinius {
opcode call_flags_;
// Cached Function*s
- llvm::Function* rbx_simple_send_;
- llvm::Function* rbx_simple_send_private_;
+ llvm::Function* rbx_simple_send_ __attribute__((unused));
+ llvm::Function* rbx_simple_send_private_ __attribute__((unused));
// bail out destinations
llvm::BasicBlock* bail_out_;
View
2 vm/type_info.hpp
@@ -19,7 +19,7 @@ namespace rubinius {
class GCTokenImpl {
private:
- int dummy;
+ int dummy __attribute__((unused));
};
typedef GCTokenImpl& GCToken;
View
2 vm/util/bert.hpp
@@ -895,7 +895,7 @@ namespace bert {
Value* new_dict() {
Term* list = tzr_.next_term();
- if(!list->type() == Term::List) {
+ if(!(list->type() == Term::List)) {
delete list;
return new_invalid();
}

0 comments on commit c943f91

Please sign in to comment.
Something went wrong with that request. Please try again.