Commit dc6cfb04 authored by Philip Pronin's avatar Philip Pronin Committed by Jordan DeLong

fix some of the warning/errors clang 3.1 reports - 2

Test Plan:
fbconfig -r folly && fbmake opt -j32

to make sure gcc is still able to compile it

Reviewed By: tudorb@fb.com

FB internal diff: D678500
parent 86d219c3
/* /*
* Copyright 2012 Facebook, Inc. * Copyright 2013 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -394,7 +394,7 @@ class AtomicHashMap : boost::noncopyable { ...@@ -394,7 +394,7 @@ class AtomicHashMap : boost::noncopyable {
SimpleRetT findInternal(const KeyT k) const; SimpleRetT findInternal(const KeyT k) const;
SimpleRetT findAtInternal(const uint32_t idx) const; SimpleRetT findAtInternal(uint32_t idx) const;
std::atomic<SubMap*> subMaps_[kNumSubMaps_]; std::atomic<SubMap*> subMaps_[kNumSubMaps_];
std::atomic<uint32_t> numMapsAllocated_; std::atomic<uint32_t> numMapsAllocated_;
......
/* /*
* Copyright 2012 Facebook, Inc. * Copyright 2013 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -20,8 +20,9 @@ ...@@ -20,8 +20,9 @@
#ifndef FOLLY_EXPERIMENTAL_EXCEPTION_TRACER_EXCEPTIONTRACER_H_ #ifndef FOLLY_EXPERIMENTAL_EXCEPTION_TRACER_EXCEPTIONTRACER_H_
#define FOLLY_EXPERIMENTAL_EXCEPTION_TRACER_EXCEPTIONTRACER_H_ #define FOLLY_EXPERIMENTAL_EXCEPTION_TRACER_EXCEPTIONTRACER_H_
#include <vector>
#include <iostream> #include <iostream>
#include <typeinfo>
#include <vector>
namespace folly { namespace folly {
namespace exception_tracer { namespace exception_tracer {
......
/* /*
* Copyright 2012 Facebook, Inc. * Copyright 2013 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <dlfcn.h> #include <dlfcn.h>
#include <pthread.h> #include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -45,19 +44,22 @@ __thread StackTraceStack* caughtExceptions; ...@@ -45,19 +44,22 @@ __thread StackTraceStack* caughtExceptions;
pthread_once_t initialized = PTHREAD_ONCE_INIT; pthread_once_t initialized = PTHREAD_ONCE_INIT;
extern "C" { extern "C" {
typedef void (*CxaThrowType)(void*, std::type_info*, void (*)(void)); typedef void (*CxaThrowType)(void*, std::type_info*, void (*)(void))
__attribute__((noreturn));
typedef void* (*CxaBeginCatchType)(void*); typedef void* (*CxaBeginCatchType)(void*);
typedef void (*CxaRethrowType)(void); typedef void (*CxaRethrowType)(void)
__attribute__((noreturn));
typedef void (*CxaEndCatchType)(void); typedef void (*CxaEndCatchType)(void);
CxaThrowType orig_cxa_throw __attribute__((noreturn)); CxaThrowType orig_cxa_throw;
CxaBeginCatchType orig_cxa_begin_catch; CxaBeginCatchType orig_cxa_begin_catch;
CxaRethrowType orig_cxa_rethrow __attribute__((noreturn)); CxaRethrowType orig_cxa_rethrow;
CxaEndCatchType orig_cxa_end_catch; CxaEndCatchType orig_cxa_end_catch;
} // extern "C" } // extern "C"
typedef void (*RethrowExceptionType)(std::exception_ptr); typedef void (*RethrowExceptionType)(std::exception_ptr)
RethrowExceptionType orig_rethrow_exception __attribute__((noreturn)); __attribute__((noreturn));
RethrowExceptionType orig_rethrow_exception;
void initialize() { void initialize() {
orig_cxa_throw = (CxaThrowType)dlsym(RTLD_NEXT, "__cxa_throw"); orig_cxa_throw = (CxaThrowType)dlsym(RTLD_NEXT, "__cxa_throw");
......
/* /*
* Copyright 2012 Facebook, Inc. * Copyright 2013 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -251,8 +251,8 @@ TEST(Gen, OrderTake) { ...@@ -251,8 +251,8 @@ TEST(Gen, OrderTake) {
TEST(Gen, MinBy) { TEST(Gen, MinBy) {
EXPECT_EQ(7, seq(1, 10) EXPECT_EQ(7, seq(1, 10)
| minBy([](int i) { | minBy([](int i) -> double {
auto d = i - 6.8; double d = i - 6.8;
return d * d; return d * d;
})); }));
} }
......
/* /*
* Copyright 2012 Facebook, Inc. * Copyright 2013 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
// @author Nicholas Ormrod <njormrod@fb.com> // @author Nicholas Ormrod <njormrod@fb.com>
#include "folly/DynamicConverter.h" #include "folly/DynamicConverter.h"
#include <algorithm>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include "folly/Benchmark.h" #include "folly/Benchmark.h"
...@@ -143,6 +145,7 @@ TEST(DynamicConverter, map_keyed_by_string) { ...@@ -143,6 +145,7 @@ TEST(DynamicConverter, map_keyed_by_string) {
TEST(DynamicConverter, map_to_vector_of_pairs) { TEST(DynamicConverter, map_to_vector_of_pairs) {
dynamic d1 = dynamic::object("1", "one")("2", "two"); dynamic d1 = dynamic::object("1", "one")("2", "two");
auto i1 = convertTo<std::vector<std::pair<std::string, std::string>>>(d1); auto i1 = convertTo<std::vector<std::pair<std::string, std::string>>>(d1);
std::sort(i1.begin(), i1.end());
decltype(i1) i1b = { { "1", "one" }, { "2", "two" } }; decltype(i1) i1b = { { "1", "one" }, { "2", "two" } };
EXPECT_EQ(i1, i1b); EXPECT_EQ(i1, i1b);
} }
......
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