Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Commit d6e1615

Browse files
committed
Fix lintian spelling-error-in-binary: instanciate -> instantiate
But only in the comments. No API/ABI breaking function renaming.
1 parent 1e225d7 commit d6e1615

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

cppapi/client/Connection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
/**
4343
* Base class for Tango device access
4444
*
45-
* Base class for Tango device access. This class is pure virtual and can be instanciated
45+
* Base class for Tango device access. This class is pure virtual and can be instantiated
4646
* as is.
4747
*
4848
* $Author: taurel $

cppapi/server/attribute_spec.tpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#define _ATTRIBUTE_SPEC_TPP
3535

3636
//
37-
// These methods are in a sepearte files because I did not find a way to explicitely instanciate specialized
37+
// These methods are in a sepearte files because I did not find a way to explicitely instantiate specialized
3838
// templates. Therefore, for template management we have three files:
3939
// 1 - A file with explicit template instanciation (templ_inst.cpp)
4040
// 2 - A file with template method definition (attribute.tpp for Attribute class)

cppapi/server/devicelog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ log4tango::Logger* DeviceImpl::get_logger_i (void)
119119
try {
120120
// trace
121121
cout4 << "Entering DeviceImpl::get_logger_i" << endl;
122-
// instanciate the logger (
122+
// instantiate the logger (
123123
// shame on me for a such huggly impl. but polymorphism
124124
// can't be used here !
125125
if (logger == 0) {
@@ -134,7 +134,7 @@ log4tango::Logger* DeviceImpl::get_logger_i (void)
134134
dev_name.end(),
135135
dev_name.begin(),
136136
::tolower);
137-
// instanciate the logger using device name
137+
// instantiate the logger using device name
138138
logger = new log4tango::Logger(dev_name);
139139
if (logger == 0) {
140140
logger = Logging::get_core_logger();

cppapi/server/logging.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void Logging::init (const std::string& ds_name, // dserver name
139139
_VERBOSE(("\tTANGO_LOG_PATH is %s\n", Logging::_log_path.c_str()));
140140
// build logger name from dserver name
141141
std::string dserver_dev_name("dserver/" + ds_name);
142-
// instanciate the logger
142+
// instantiate the logger
143143
log4tango::Logger* logger = new log4tango::Logger(dserver_dev_name);
144144
// is logging level set from cmd line?
145145
bool level_set_from_cmd_line = (cmd_line_level >= kTANGO_CORE_CMD_LINE_LEVEL)
@@ -410,7 +410,7 @@ void Logging::add_logging_target(log4tango::Logger* logger,
410410
log4tango::Appender* appender = logger->get_appender(appender_name);
411411
if (!appender) {
412412
cout4 << "Adding logging target " << appender_name << " to " << logger->get_name() << endl;
413-
// instanciate the appender (i.e. the target) and the layout (if needed)
413+
// instantiate the appender (i.e. the target) and the layout (if needed)
414414
switch (ltg_type) {
415415
case LOG_CONSOLE: {
416416
appender = new CoutAppender(appender_name);
@@ -687,13 +687,13 @@ Tango::DevVarStringArray* Logging::get_logging_target (const std::string& dev_na
687687
log4tango::Logger *logger = dev->get_logger();
688688
if (logger == 0) {
689689
TangoSys_OMemStream o;
690-
o << "Could not instanciate logger (out of memory error)" << ends;
690+
o << "Could not instantiate logger (out of memory error)" << ends;
691691
Except::throw_exception((const char *)API_MemoryAllocation, o.str(),
692692
(const char *)"Logging::get_logging_target");
693693
}
694694
// get logger's appender list
695695
log4tango::AppenderList al = logger->get_all_appenders();
696-
// instanciate the returned value
696+
// instantiate the returned value
697697
ret = new Tango::DevVarStringArray(al.size());
698698
if (ret == 0) {
699699
TangoSys_OMemStream o;

cppapi/server/utils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class Util
166166
*
167167
* This method returns a reference to the object of the Util class.
168168
* If the class singleton object has not been created, it will be
169-
* instanciated
169+
* instantiated
170170
*
171171
* @param argc The process command line argument number
172172
* @param argv The process commandline arguments
@@ -179,7 +179,7 @@ class Util
179179
*
180180
* This method returns a reference to the object of the Util class.
181181
* If the class singleton object has not been created, it will be
182-
* instanciated. This method must be used only for non-console mode windows
182+
* instantiated. This method must be used only for non-console mode windows
183183
* device server
184184
*
185185
* @param AppInst The application instance

cppapi/server/utils_polling.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ void Util::check_pool_conf(DServer *admin_dev,unsigned long pool_size)
12511251
vector<string> mod_conf = poll_pool_conf;
12521252

12531253
//
1254-
// First, get the list of devices instanciated in this server and check if the polled devices are defined within
1254+
// First, get the list of devices instantiated in this server and check if the polled devices are defined within
12551255
// the server
12561256
//
12571257

@@ -1282,7 +1282,7 @@ void Util::check_pool_conf(DServer *admin_dev,unsigned long pool_size)
12821282
continue;
12831283

12841284
//
1285-
// Check if the device is instanciated in this server
1285+
// Check if the device is instantiated in this server
12861286
//
12871287

12881288
string entry_lower(*iter_entry);

0 commit comments

Comments
 (0)