From 4b51a45b8742e288473dd45a4990095346273d99 Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver.bock@aei.mpg.de>
Date: Wed, 14 May 2008 16:53:31 +0200
Subject: [PATCH] Removing explicit linkage
---
ResourceFactory.h | 6 +++---
Starsphere.h | 12 ++++++------
orc/ResourceCompiler.cpp | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ResourceFactory.h b/ResourceFactory.h
index f66bed6..b8789bd 100644
--- a/ResourceFactory.h
+++ b/ResourceFactory.h
@@ -84,7 +84,7 @@ private:
* \todo Does this need to be global?
* Maybe we should wrap a class around the generated resources?
*/
-extern "C++" const string c_ResourceIdentifiers[];
+extern const string c_ResourceIdentifiers[];
/**
* \brief Declaration of the external list of resource indices
@@ -98,7 +98,7 @@ extern "C++" const string c_ResourceIdentifiers[];
* \todo Does this need to be global?
* Maybe we should wrap a class around the generated resources?
*/
-extern "C++" const unsigned int c_ResourceIndex[][2];
+extern const unsigned int c_ResourceIndex[][2];
/**
* \brief Declaration of the external resource storage container
@@ -110,6 +110,6 @@ extern "C++" const unsigned int c_ResourceIndex[][2];
* \todo Does this need to be global?
* Maybe we should wrap a class around the generated resources?
*/
-extern "C++" const unsigned char c_ResourceStorage[];
+extern const unsigned char c_ResourceStorage[];
#endif /*RESOURCEFACTORY_H_*/
diff --git a/Starsphere.h b/Starsphere.h
index 6f4243b..8c884a2 100644
--- a/Starsphere.h
+++ b/Starsphere.h
@@ -246,15 +246,15 @@ private:
};
/* Constellation & star coordinates are in starlist.C */
-extern "C" float star_info[][2];
-extern "C" int Nstars;
+extern float star_info[][2];
+extern int Nstars;
/* Pulsar coordinates are in pulsar_list.C */
-extern "C" float pulsar_info[][2];
-extern "C" int Npulsars;
+extern float pulsar_info[][2];
+extern int Npulsars;
/* SNR coordinates are in snr_list.C */
-extern "C" float SNR_info[][2];
-extern "C" int NSNRs;
+extern float SNR_info[][2];
+extern int NSNRs;
#endif /*STARSPHERE_H_*/
diff --git a/orc/ResourceCompiler.cpp b/orc/ResourceCompiler.cpp
index 9ef6696..a2ed6f9 100644
--- a/orc/ResourceCompiler.cpp
+++ b/orc/ResourceCompiler.cpp
@@ -84,17 +84,17 @@ void ResourceCompiler::compile()
// write code file contents (remove trailing commas)
string output = resourceIdentifierInitializer.str();
- outputFile << "extern \"C++\" const std::string c_ResourceIdentifiers[] = {" << endl;
+ outputFile << "extern const std::string c_ResourceIdentifiers[] = {" << endl;
outputFile << output.substr(0, output.length() - 1);
outputFile << endl << "};" << endl << endl;
output = resourceIndexInitializer.str();
- outputFile << "extern \"C++\" const unsigned int c_ResourceIndex[][2] = {" << endl;
+ outputFile << "extern const unsigned int c_ResourceIndex[][2] = {" << endl;
outputFile << output.substr(0, output.length() - 1);
outputFile << endl << "};" << endl << endl;
output = resourceStorageInitializer.str();
- outputFile << "extern \"C++\" const unsigned char c_ResourceStorage[] = {" << endl;
+ outputFile << "extern const unsigned char c_ResourceStorage[] = {" << endl;
outputFile << output.substr(0, output.length() - 1);
outputFile << endl << "};" << endl << endl;
}
--
GitLab