A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SMPI] Reverted removal of 'extern C' as this broke things.
[simgrid.git]
/
src
/
smpi
/
private.hpp
diff --git
a/src/smpi/private.hpp
b/src/smpi/private.hpp
index
cc87c97
..
a384ac7
100644
(file)
--- a/
src/smpi/private.hpp
+++ b/
src/smpi/private.hpp
@@
-1,6
+1,12
@@
+/* Copyright (c) 2016. The SimGrid Team. All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
#ifndef SMPI_PRIVATE_HPP
#define SMPI_PRIVATE_HPP
#ifndef SMPI_PRIVATE_HPP
#define SMPI_PRIVATE_HPP
+#include <unordered_map>
#include "src/instr/instr_smpi.h"
#ifdef HAVE_PAPI
#include "src/instr/instr_smpi.h"
#ifdef HAVE_PAPI
@@
-10,11
+16,11
@@
XBT_PRIVATE papi_counter_t& smpi_process_counter_data(void);
XBT_PRIVATE int smpi_process_event_set(void);
#endif
XBT_PRIVATE int smpi_process_event_set(void);
#endif
-extern std::map<std::string, double> location2speedup;
-#endif
+extern std::unordered_map<std::string, double> location2speedup;
-/**
- * \brief Returns the last call location (filename, linenumber). Process-specific.
- */
+/** @brief Returns the last call location (filename, linenumber). Process-specific. */
+extern "C" {
XBT_PUBLIC(smpi_trace_call_location_t*) smpi_process_get_call_location(void);
XBT_PUBLIC(smpi_trace_call_location_t*) smpi_trace_get_call_location();
XBT_PUBLIC(smpi_trace_call_location_t*) smpi_process_get_call_location(void);
XBT_PUBLIC(smpi_trace_call_location_t*) smpi_trace_get_call_location();
+}
+#endif