From 5ba2d7253737eba8d6f2d0a077c2eec79df79260 Mon Sep 17 00:00:00 2001
From: whh8b <whh8b@git.zephyr-software.com>
Date: Wed, 11 Nov 2015 03:18:30 +0000
Subject: [PATCH] Go away from anything C++11 specific.
---
SConstruct | 2 +-
include/zipr_impl.h | 8 +-------
src/plugin_man.cpp | 2 +-
src/zipr.cpp | 2 +-
test/SConscript | 2 +-
5 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/SConstruct b/SConstruct
index ff3f7e3..c173b44 100644
--- a/SConstruct
+++ b/SConstruct
@@ -8,7 +8,7 @@ env=Environment()
# default build options
env.Replace(CFLAGS=" -fPIC ")
-env.Replace(CXXFLAGS=" -std=c++11 -fPIC ")
+env.Replace(CXXFLAGS="-fPIC ")
env.Replace(LINKFLAGS=" -fPIC ")
# parse arguments
diff --git a/include/zipr_impl.h b/include/zipr_impl.h
index d7ee537..e5d5c9d 100644
--- a/include/zipr_impl.h
+++ b/include/zipr_impl.h
@@ -31,7 +31,6 @@
#ifndef zipr_impl_h
#define zipr_impl_h
-#include <random>
#include <climits>
class Stats_t;
@@ -45,7 +44,6 @@ class ZiprImpl_t : public Zipr_t
elfiop(new ELFIO::elfio),
start_of_new_space(0),
memory_space(),
- random_int_distribution(1,INT_MAX),
m_zipr_options(argc-1, argv+1),
m_output_filename("output", "b.out"),
m_callbacks("callbacks"),
@@ -54,7 +52,7 @@ class ZiprImpl_t : public Zipr_t
m_verbose("verbose", true),
m_variant("variant"),
m_architecture("architecture"),
- m_seed("seed", random_int_distribution(random_generator))
+ m_seed("seed", 0)
{
Init();
};
@@ -174,10 +172,6 @@ class ZiprImpl_t : public Zipr_t
std::map<libIRDB::Instruction_t*,DLFunctionHandle_t> plopping_plugins;
- // For default seed generation.
- std::default_random_engine random_generator;
- std::uniform_int_distribution<int> random_int_distribution;
-
// Options
ZiprOptions_t m_zipr_options;
ZiprStringOption_t m_output_filename, m_callbacks, m_objcopy;
diff --git a/src/plugin_man.cpp b/src/plugin_man.cpp
index 2e3885e..5e636b3 100644
--- a/src/plugin_man.cpp
+++ b/src/plugin_man.cpp
@@ -87,7 +87,7 @@ bool ZiprPluginManager_t::DoesPluginPlace(const RangeAddress_t &jump, const Doll
for(m_handleList.begin();it!=m_handleList.end();++it)
{
ZiprPluginInterface_t* zpi=(ZiprPluginInterface_t*)*it;
- if (Zipr_SDK::ZiprPreference::Must == zpi->PlopAddress(jump, dollop, place))
+ if (Must == zpi->PlopAddress(jump, dollop, place))
{
placer = zpi;
return true;
diff --git a/src/zipr.cpp b/src/zipr.cpp
index 031a88c..2210d39 100644
--- a/src/zipr.cpp
+++ b/src/zipr.cpp
@@ -2248,7 +2248,7 @@ void ZiprImpl_t::dump_map()
// std::map<libIRDB::Instruction_t*,RangeAddress_t> final_insn_locations
string filename="zipr.map"; // parameterize later.
- std::ofstream ofs(filename, std::ofstream::out);
+ std::ofstream ofs(filename.c_str(), ios_base::out);
ofs <<left<<setw(20)<<"ID"
<<left<<setw(20)<<"OrigAddr"
diff --git a/test/SConscript b/test/SConscript
index 7bda378..c65b3f2 100644
--- a/test/SConscript
+++ b/test/SConscript
@@ -49,7 +49,7 @@ libpath='''
'''
myenv.Append(CCFLAGS=" -Wall ")
-myenv.Append(CXXFLAGS=" -g -O0 -std=c++11 ")
+myenv.Append(CXXFLAGS=" -g -O0 ")
myenv.Append(LINKFLAGS=" -Wl,-E ") # export all symbols
--
GitLab