The following commit has been merged in the master branch:
commit f6c16092bed37f55d448cddb3a25c8a2eea32923
Author: Andrei Zavada <[email protected]>
Date: Sun Mar 3 00:35:01 2013 +0200
proper use of anonymous namespaces
"inline namespace" is too hip
diff --git a/src/expdesign/tree-scanner.cc b/src/expdesign/tree-scanner.cc
index 553e2c7..bcae68c 100644
--- a/src/expdesign/tree-scanner.cc
+++ b/src/expdesign/tree-scanner.cc
@@ -22,14 +22,14 @@ using namespace std;
-inline namespace {
+namespace {
struct progress_fun_stdout_fo {
void operator() ( const char* current, size_t n, size_t i) const
{
printf( "(%zu of %zu) %s\n", i, n, current);
}
};
-} // inline namespace
+} // namespace
agh::CExpDesign::TMsmtCollectProgressIndicatorFun
agh::CExpDesign::progress_fun_stdout = progress_fun_stdout_fo();
@@ -228,7 +228,7 @@ register_intree_source( sigfile::CTypedSource&& F,
-inline namespace {
+namespace {
size_t
__cur_edf_file;
@@ -285,7 +285,7 @@ avg_tm( vector<TTimePair>& tms)
return pair<float, float> (avg_start / tms.size(), avg_end /
tms.size());
}
-} // inline namespace
+} // namespace
void
agh::CExpDesign::
diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index 44e9005..14c660f 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -105,7 +105,7 @@ set_start_time( time_t s)
#define EOA '$'
-inline namespace {
+namespace {
const char version_string[8] = {'0',' ',' ',' ', ' ',' ',' ',' '};
diff --git a/src/model/achermann-siman.cc b/src/model/achermann-siman.cc
index a49d076..d642a33 100644
--- a/src/model/achermann-siman.cc
+++ b/src/model/achermann-siman.cc
@@ -21,7 +21,7 @@
using namespace std;
-inline namespace {
+namespace {
struct SAchermannSimanPPack {
agh::ach::CModelRun *R;
@@ -128,7 +128,7 @@ _siman_metric( void *xp, void *yp)
// printf( "\n");
// }
-} // inline namespace
+} // namespace
diff --git a/src/model/borbely.cc b/src/model/borbely.cc
index 41d01a4..f7e2e73 100644
--- a/src/model/borbely.cc
+++ b/src/model/borbely.cc
@@ -23,7 +23,7 @@
using namespace std;
-inline namespace {
+namespace {
// see
http://www.gnu.org/software/gsl/manual/html_node/Example-programs-for-Nonlinear-Least_002dSquares-Fitting.html
@@ -95,7 +95,7 @@ print_state( size_t iter, gsl_multifit_fdfsolver* s)
gsl_blas_dnrm2 (s->f));
}
-} // inline namespace
+} // namespace
agh::beersma::SClassicFit
agh::beersma::
diff --git a/src/model/ultradian-cycle.cc b/src/model/ultradian-cycle.cc
index a24b04a..37453c3 100644
--- a/src/model/ultradian-cycle.cc
+++ b/src/model/ultradian-cycle.cc
@@ -31,7 +31,7 @@ constexpr double
}
}
-inline namespace {
+namespace {
struct SUltradianCyclePPack {
double X[4];
@@ -148,7 +148,7 @@ uc_siman_metric( void *xp, void *yp)
// P.X[0], P.X[1], P.X[2], P.X[3]);
// }
-} // inline namespace
+} // namespace
diff --git a/src/patterns/patterns.cc b/src/patterns/patterns.cc
index 5178c47..c88cdfc 100644
--- a/src/patterns/patterns.cc
+++ b/src/patterns/patterns.cc
@@ -25,7 +25,7 @@ template int pattern::CPatternTool<TFloat>::do_search( const
valarray<TFloat>&,
-inline namespace {
+namespace {
int
scandir_filter( const struct dirent *e)
{
diff --git a/src/ui/mf/mf.cc b/src/ui/mf/mf.cc
index 447f240..7abf514 100644
--- a/src/ui/mf/mf.cc
+++ b/src/ui/mf/mf.cc
@@ -23,7 +23,7 @@
using namespace std;
using namespace aghui;
-inline namespace {
+namespace {
unsigned short __score_hypn_depth[8] = {
0, 20, 23, 30, 33, 5, 10, 1
};
diff --git a/src/ui/mf/mf_cb.cc b/src/ui/mf/mf_cb.cc
index 55ca94e..41c00e3 100644
--- a/src/ui/mf/mf_cb.cc
+++ b/src/ui/mf/mf_cb.cc
@@ -141,7 +141,7 @@ daMFProfile_scroll_event_cb( GtkWidget *wid, GdkEventScroll
*event, gpointer use
-inline namespace {
+namespace {
aghui::SModelrunFacility *this_mf = nullptr;
void this_mf_siman_param_printer(void *xp)
{
diff --git a/src/ui/mw/loadsave.cc b/src/ui/mw/loadsave.cc
index 0bcde6b..c940c43 100644
--- a/src/ui/mw/loadsave.cc
+++ b/src/ui/mw/loadsave.cc
@@ -21,7 +21,7 @@ using namespace aghui;
#define CONF_FILE ".aghermann.conf"
-inline namespace {
+namespace {
forward_list<pair<const char*, aghui::SExpDesignUI::TColour>>
saving_colors()
@@ -74,7 +74,7 @@ saving_colors()
{"MFLabels", SExpDesignUI::TColour::mf_labels }
});
}
-} // inline namespace
+} // namespace
int
aghui::SExpDesignUI::
diff --git a/src/ui/mw/mainmenu_cb.cc b/src/ui/mw/mainmenu_cb.cc
index 58b6d57..805a47e 100644
--- a/src/ui/mw/mainmenu_cb.cc
+++ b/src/ui/mw/mainmenu_cb.cc
@@ -341,7 +341,7 @@ iHelpUsage_activate_cb( GtkMenuItem*, gpointer)
}
-inline namespace {
+namespace {
void
before_ED_close( SExpDesignUI& ED)
@@ -350,7 +350,7 @@ before_ED_close( SExpDesignUI& ED)
gtk_window_get_size( ED.wMainWindow, &ED.geometry.w, &ED.geometry.h);
}
-} // inline namespace
+} // namespace
void
iExpClose_activate_cb( GtkMenuItem*, gpointer userdata)
diff --git a/src/ui/mw/mw_cb.cc b/src/ui/mw/mw_cb.cc
index 7aec441..142861e 100644
--- a/src/ui/mw/mw_cb.cc
+++ b/src/ui/mw/mw_cb.cc
@@ -146,7 +146,7 @@ eMsmtProfileType_changed_cb( GtkComboBox* b, gpointer
userdata)
-inline namespace {
+namespace {
void
mike_dewhirst_is_not_real( SExpDesignUI& ED)
{
@@ -168,7 +168,7 @@ mike_dewhirst_is_not_real( SExpDesignUI& ED)
gtk_widget_queue_draw( (GtkWidget*)ED.cMeasurements);
}
-}; // inline namespace
+}; // namespace
void
eMsmtProfileParamsPSDFreqFrom_value_changed_cb( GtkSpinButton *spinbutton,
gpointer userdata)
diff --git a/src/ui/mw/populate.cc b/src/ui/mw/populate.cc
index b95d06f..f7b90da 100644
--- a/src/ui/mw/populate.cc
+++ b/src/ui/mw/populate.cc
@@ -256,7 +256,7 @@ __reconnect_sessions_combo()
}
-inline namespace {
+namespace {
const char*
annotation_type_s( sigfile::SAnnotation::TType t)
{
diff --git a/src/ui/mw/settings_cb.cc b/src/ui/mw/settings_cb.cc
index 3affd3e..153892f 100644
--- a/src/ui/mw/settings_cb.cc
+++ b/src/ui/mw/settings_cb.cc
@@ -108,7 +108,7 @@ tDesign_switch_page_cb( GtkNotebook*, gpointer, guint
page_num, gpointer userdat
-inline namespace {
+namespace {
void
__adjust_adjustments( SExpDesignUI& ED)
@@ -166,7 +166,7 @@ __adjust_tunables_down( SExpDesignUI& ED)
}
}
-} // inline namespace
+} // namespace
void
tSimulations_switch_page_cb( GtkNotebook*, gpointer, guint page_num, gpointer
userdata)
diff --git a/src/ui/mw/splash.cc b/src/ui/mw/splash.cc
index d9bc804..b949420 100644
--- a/src/ui/mw/splash.cc
+++ b/src/ui/mw/splash.cc
@@ -22,7 +22,7 @@ using namespace std;
-inline namespace {
+namespace {
extern "C" {
void
@@ -51,7 +51,7 @@ download_process_child_exited_cb( VteTerminal *terminal,
gpointer userdata)
}
} // extern "C"
-} // inline namespace
+} // namespace
diff --git a/src/ui/sf/d/patterns-profiles_cb.cc
b/src/ui/sf/d/patterns-profiles_cb.cc
index 64c368a..7c3b7c2 100644
--- a/src/ui/sf/d/patterns-profiles_cb.cc
+++ b/src/ui/sf/d/patterns-profiles_cb.cc
@@ -83,7 +83,7 @@ bSFFDProfileSave_clicked_cb( GtkButton*, gpointer userdata)
}
-inline namespace {
+namespace {
void
hildebranden(gpointer userdata)
{
diff --git a/src/ui/sf/d/patterns_cb.cc b/src/ui/sf/d/patterns_cb.cc
index a5fba7c..50a3d10 100644
--- a/src/ui/sf/d/patterns_cb.cc
+++ b/src/ui/sf/d/patterns_cb.cc
@@ -323,7 +323,7 @@ eSFFD_any_pattern_value_changed_cb( GtkSpinButton*,
gpointer userdata)
gtk_widget_queue_draw( (GtkWidget*)FD.daSFFDThing);
}
-inline namespace {
+namespace {
inline double
timeval_elapsed( const struct timeval &x, const struct timeval &y)
{
diff --git a/src/ui/sf/hypnogram.cc b/src/ui/sf/hypnogram.cc
index 4420263..a8ed3d0 100644
--- a/src/ui/sf/hypnogram.cc
+++ b/src/ui/sf/hypnogram.cc
@@ -19,7 +19,7 @@
using namespace std;
-inline namespace {
+namespace {
unsigned short __score_hypn_depth[8] = {
0, 20, 23, 30, 33, 5, 10, 1
diff --git a/src/ui/sf/ica_cb.cc b/src/ui/sf/ica_cb.cc
index df77182..cb8373b 100644
--- a/src/ui/sf/ica_cb.cc
+++ b/src/ui/sf/ica_cb.cc
@@ -212,7 +212,7 @@ bSFICAPreview_toggled_cb( GtkToggleButton *button, gpointer
userdata)
SF.queue_redraw_all();
}
-inline namespace {
+namespace {
void
mat2text_buffer( GtkTextBuffer *buffer, const itpp::mat& mx)
{
@@ -228,7 +228,7 @@ mat2text_buffer( GtkTextBuffer *buffer, const itpp::mat& mx)
}
}
-} // inline namespace
+} // namespace
void
bSFICAShowMatrix_toggled_cb( GtkToggleButton *button, gpointer userdata)
{
diff --git a/src/ui/sf/montage.cc b/src/ui/sf/montage.cc
index 410fac3..e6f3ea0 100644
--- a/src/ui/sf/montage.cc
+++ b/src/ui/sf/montage.cc
@@ -18,7 +18,7 @@
using namespace std;
-inline namespace {
+namespace {
unsigned short PageTicks[] = {
8, 10, 10, 5, 5, 6, 12, 24, 30
diff --git a/src/ui/sf/montage_cb.cc b/src/ui/sf/montage_cb.cc
index afa1fbb..bf18141 100644
--- a/src/ui/sf/montage_cb.cc
+++ b/src/ui/sf/montage_cb.cc
@@ -51,7 +51,7 @@ daSFMontage_draw_cb( GtkWidget *wid, cairo_t *cr, gpointer
userdata)
}
-inline namespace {
+namespace {
void
radio_item_setter( GtkWidget *i, gpointer u)
{
@@ -59,7 +59,7 @@ radio_item_setter( GtkWidget *i, gpointer u)
if ( strcmp(label, (const char*)u) == 0 )
gtk_check_menu_item_set_active( (GtkCheckMenuItem*)i, TRUE);
}
-} // inline namespace
+} // namespace
gboolean
@@ -197,7 +197,7 @@ daSFMontage_button_press_event_cb( GtkWidget *wid,
GdkEventButton *event, gpoint
-inline namespace {
+namespace {
inline double
timeval_elapsed( const struct timeval &x, const struct timeval &y)
{
diff --git a/src/ui/sf/sf_cb.cc b/src/ui/sf/sf_cb.cc
index 85e7400..8fa8d76 100644
--- a/src/ui/sf/sf_cb.cc
+++ b/src/ui/sf/sf_cb.cc
@@ -251,7 +251,7 @@ iSFAcceptAndTakeNext_activate_cb( GtkMenuItem *menuitem,
gpointer userdata)
-inline namespace {
+namespace {
#define EVENT_X 30
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
